[paparazzi-commits] [4207]

[antoine drouin]

Revision: 4207
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4207
Author:   poine
Date:     2009-09-29 14:57:54 +0000 (Tue, 29 Sep 2009)
Log Message:
-----------


Modified Paths:
--------------
    paparazzi3/trunk/conf/autopilot/booz2_test_progs.makefile
    paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h
    paparazzi3/trunk/sw/airborne/booz/test/booz2_test_usb.c

Modified: paparazzi3/trunk/conf/autopilot/booz2_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/booz2_test_progs.makefile   2009-09-29 
07:34:36 UTC (rev 4206)
+++ paparazzi3/trunk/conf/autopilot/booz2_test_progs.makefile   2009-09-29 
14:57:54 UTC (rev 4207)
@@ -135,7 +135,7 @@
 test_usb.TARGET = test_usb
 test_usb.TARGETDIR = test_usb
 
-test_usb.CFLAGS += -DBOARD_CONFIG=\"booz2_board_usb.h\" $(BOOZ_CFLAGS)
+test_usb.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
 test_usb.srcs += $(SRC_BOOZ_TEST)/booz2_test_usb.c
 test_usb.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC((1./512.))'
 # -DTIME_LED=1

Modified: paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h 2009-09-29 07:34:36 UTC 
(rev 4206)
+++ paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h 2009-09-29 14:57:54 UTC 
(rev 4207)
@@ -56,7 +56,7 @@
     uint8_t _twi_blmc_nb_err = 0;                                      \
     DOWNLINK_SEND_BOOZ_STATUS(_chan,                                   \
                              &booz_imu_nb_err,                         \
-                             &_twi_blmc_nb_err,                                
\
+                             &_twi_blmc_nb_err,                        \
                              &radio_control.status,                    \
                              &booz_gps_state.fix,                      \
                              &booz2_autopilot_mode,                    \

Modified: paparazzi3/trunk/sw/airborne/booz/test/booz2_test_usb.c
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/test/booz2_test_usb.c     2009-09-29 
07:34:36 UTC (rev 4206)
+++ paparazzi3/trunk/sw/airborne/booz/test/booz2_test_usb.c     2009-09-29 
14:57:54 UTC (rev 4207)
@@ -28,7 +28,6 @@
 #include "sys_time.h"
 #include "led.h"
 
-//#include "uart.h"
 #include "usb_serial.h"
 
 #include "messages.h"
@@ -56,7 +55,6 @@
   sys_time_init();
   led_init();
 
-  //uart1_init_tx();
   VCOM_init();
 
   int_enable();
@@ -65,7 +63,7 @@
 static inline void main_periodic_task( void ) {
   RunOnceEvery(10, {
       LED_TOGGLE(1);
-      DOWNLINK_SEND_ALIVE(16, MD5SUM);
+      DOWNLINK_SEND_ALIVE(PprzTransport,16, MD5SUM);
     });
 }