diff --git a/conf/airframes/booz2_flixr.xml b/conf/airframes/booz2_flixr.xml index 5f77c3262b..d8730a730d 100644 --- a/conf/airframes/booz2_flixr.xml +++ b/conf/airframes/booz2_flixr.xml @@ -1,5 +1,11 @@ + + + + + + @@ -230,6 +236,12 @@ ap.CFLAGS += -DUSE_GPS_ACC4R #ap.CFLAGS += -DGPS_LAG=0.3 + ap.srcs += $(SRC_BOOZ_ARCH)/booz2_pwm_hw.c + sim.srcs += $(SRC_BOOZ_SIM)/booz2_pwm_hw.c + + ap.CFLAGS += -DUSEMODULES + sim.CFLAGS += -DUSEMODULES + ap.CFLAGS += -DB2_GUIDANCE_H_USE_REF sim.CFLAGS += -DB2_GUIDANCE_H_USE_REF diff --git a/conf/modules/booz_drop.xml b/conf/modules/booz_drop.xml index 006cfe1e5b..139cbc78ef 100644 --- a/conf/modules/booz_drop.xml +++ b/conf/modules/booz_drop.xml @@ -9,6 +9,8 @@ + + diff --git a/sw/airborne/modules/drop/booz_drop.c b/sw/airborne/modules/drop/booz_drop.c index 1b640ecd04..1d9623e0e9 100644 --- a/sw/airborne/modules/drop/booz_drop.c +++ b/sw/airborne/modules/drop/booz_drop.c @@ -28,8 +28,12 @@ bool_t booz_drop_ball; int16_t booz_drop_servo; +#ifndef DROP_SERVO_OPEN #define DROP_SERVO_OPEN 1700 +#endif +#ifndef DROP_SERVO_CLOSED #define DROP_SERVO_CLOSED 900 +#endif void booz_drop_init(void) { booz_drop_ball = FALSE;