[paparazzi-commits] [4570] add modules in booz

[Gautier Hattenberger]

Revision: 4570
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4570
Author:   gautier
Date:     2010-02-24 09:40:44 +0000 (Wed, 24 Feb 2010)
Log Message:
-----------
add modules in booz

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/booz/booz2_datalink.c
    paparazzi3/trunk/sw/airborne/booz/booz2_main.c

Modified: paparazzi3/trunk/sw/airborne/booz/booz2_datalink.c
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/booz2_datalink.c  2010-02-24 09:39:20 UTC 
(rev 4569)
+++ paparazzi3/trunk/sw/airborne/booz/booz2_datalink.c  2010-02-24 09:40:44 UTC 
(rev 4570)
@@ -22,7 +22,12 @@
  */
 
 #define DATALINK_C
+#define MODULES_DATALINK_C
+
 #include "datalink.h"
+#ifdef USE_MODULES
+#include "modules.h"
+#endif
 
 #include "settings.h"
 #include "downlink.h"
@@ -107,6 +112,10 @@
     }
     break;
 #endif /* USE_NAVIGATION */
+#ifdef USE_MODULES
+    /* Parse modules datalink */
+    modules_parse_datalink(msg_id);
+#endif
 
   }
 }

Modified: paparazzi3/trunk/sw/airborne/booz/booz2_main.c
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/booz2_main.c      2010-02-24 09:39:20 UTC 
(rev 4569)
+++ paparazzi3/trunk/sw/airborne/booz/booz2_main.c      2010-02-24 09:40:44 UTC 
(rev 4570)
@@ -21,6 +21,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#define MODULES_C
+
 #include <inttypes.h>
 
 #include "init_hw.h"
@@ -73,6 +75,11 @@
 #include "nps_autopilot_booz.h"
 #endif
 
+#ifdef USE_MODULES
+#include "modules.h"
+#endif
+
+
 static inline void on_gyro_accel_event( void );
 static inline void on_baro_event( void );
 static inline void on_gps_event( void );
@@ -144,6 +151,10 @@
 
   int_enable();
 
+#ifdef USE_MODULES
+  modules_init();
+#endif
+
 #if defined BOOZ_START_DELAY && ! defined SITL
   delay_done = FALSE;
   init_done_time = T0TC;
@@ -210,6 +221,10 @@
   booz2_analog_periodic();
 #endif
 
+#ifdef USE_MODULES
+  modules_periodic_task();
+#endif
+
   if (booz2_autopilot_in_flight) {
     RunOnceEvery(512, { booz2_autopilot_flight_time++; datalink_time++; });
   }
@@ -233,6 +248,10 @@
 
   Booz2AnalogBaroEvent(on_baro_event);
 
+#ifdef BOOZ2_SONAR
+  Booz2SonarEvent(booz_ins_update_sonar);
+#endif
+
 #ifdef USE_GPS
   Booz2GpsEvent(on_gps_event);
 #endif
@@ -241,6 +260,10 @@
   BoozDetectGroundEvent();
 #endif
 
+#ifdef USE_MODULES
+  modules_event_task();
+#endif
+
 }
 
 static inline void on_gyro_accel_event( void ) {