diff --git a/conf/autopilot/booz2_test_progs.makefile b/conf/autopilot/booz2_test_progs.makefile index 401d0262fc..d95f6c5659 100644 --- a/conf/autopilot/booz2_test_progs.makefile +++ b/conf/autopilot/booz2_test_progs.makefile @@ -135,7 +135,7 @@ test_usb.ARCH = arm7tdmi 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 diff --git a/sw/airborne/booz/booz2_telemetry.h b/sw/airborne/booz/booz2_telemetry.h index 046e40b376..271443f18e 100644 --- a/sw/airborne/booz/booz2_telemetry.h +++ b/sw/airborne/booz/booz2_telemetry.h @@ -56,7 +56,7 @@ extern uint8_t telemetry_mode_Main_DefaultChannel; 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, \ diff --git a/sw/airborne/booz/test/booz2_test_usb.c b/sw/airborne/booz/test/booz2_test_usb.c index ffcc883e0e..af5a86d652 100644 --- a/sw/airborne/booz/test/booz2_test_usb.c +++ b/sw/airborne/booz/test/booz2_test_usb.c @@ -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 @@ static inline void main_init( void ) { sys_time_init(); led_init(); - //uart1_init_tx(); VCOM_init(); int_enable(); @@ -65,7 +63,7 @@ static inline void main_init( void ) { static inline void main_periodic_task( void ) { RunOnceEvery(10, { LED_TOGGLE(1); - DOWNLINK_SEND_ALIVE(16, MD5SUM); + DOWNLINK_SEND_ALIVE(PprzTransport,16, MD5SUM); }); }