[paparazzi-commits] [5373] made sim compile again with new gps code

[antoine drouin]

Revision: 5373
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5373
Author:   poine
Date:     2010-08-15 15:55:22 +0000 (Sun, 15 Aug 2010)
Log Message:
-----------
made sim compile again with new gps code

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/booz/booz_gps.c
    paparazzi3/trunk/sw/airborne/booz/booz_gps.h

Modified: paparazzi3/trunk/sw/airborne/booz/booz_gps.c
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/booz_gps.c        2010-08-15 15:51:43 UTC 
(rev 5372)
+++ paparazzi3/trunk/sw/airborne/booz/booz_gps.c        2010-08-15 15:55:22 UTC 
(rev 5373)
@@ -41,8 +41,9 @@
 #ifdef GPS_LED
   LED_OFF(GPS_LED);
 #endif
+#ifdef BOOZ_GPS_TYPE_H
   booz_gps_impl_init();
-  
+#endif  
 }
 
 

Modified: paparazzi3/trunk/sw/airborne/booz/booz_gps.h
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/booz_gps.h        2010-08-15 15:51:43 UTC 
(rev 5372)
+++ paparazzi3/trunk/sw/airborne/booz/booz_gps.h        2010-08-15 15:55:22 UTC 
(rev 5373)
@@ -94,7 +94,7 @@
 #define BoozGpsEvent(_sol_available_callback) {                        \
     if (booz_gps_available) {                                  \
       if (booz_gps_state.fix == BOOZ2_GPS_FIX_3D)               \
-        booz_gps_lost_counter = 0;                              \
+        booz_gps_state.lost_counter = 0;                       \
       _sol_available_callback();                               \
       booz_gps_available = FALSE;                              \
     }                                                          \
@@ -106,6 +106,18 @@
  */
 
 
+#define __GpsLink(dev, _x) dev##_x
+#define _GpsLink(dev, _x)  __GpsLink(dev, _x)
+#define GpsLink(_x) _GpsLink(GPS_LINK, _x)
+
+#define GpsBuffer() GpsLink(ChAvailable())
+
+
+
+
+#endif /* !SITL */
+
+
 extern void booz_gps_init(void);
 
 static inline void booz_gps_periodic( void ) {
@@ -115,15 +127,6 @@
 #define GpsIsLost() (booz_gps_state.lost_counter > 20) /* 4Hz -> 5s */
 
 
-#define __GpsLink(dev, _x) dev##_x
-#define _GpsLink(dev, _x)  __GpsLink(dev, _x)
-#define GpsLink(_x) _GpsLink(GPS_LINK, _x)
 
-#define GpsBuffer() GpsLink(ChAvailable())
 
-
-
-
-#endif /* !SITL */
-
 #endif /* BOOZ2_GPS_H */