diff --git a/sw/airborne/actuators.c b/sw/airborne/actuators.c index 9845a50a65..2d89a0180e 100644 --- a/sw/airborne/actuators.c +++ b/sw/airborne/actuators.c @@ -25,7 +25,7 @@ * */ -#include "firmwares/fixedwing/actuators.h" +#include //#include "actuators.h" uint16_t actuators[SERVOS_NB]; diff --git a/sw/airborne/boards/booz/baro_board.c b/sw/airborne/boards/booz/baro_board.c index 133353dfef..43d01b5b6a 100644 --- a/sw/airborne/boards/booz/baro_board.c +++ b/sw/airborne/boards/booz/baro_board.c @@ -21,7 +21,7 @@ */ -#include "firmwares/rotorcraft/baro.h" +#include #include "airframe.h" #include "led.h" diff --git a/sw/airborne/boards/booz/baro_board.h b/sw/airborne/boards/booz/baro_board.h index 135bebbdac..d52cb09bde 100644 --- a/sw/airborne/boards/booz/baro_board.h +++ b/sw/airborne/boards/booz/baro_board.h @@ -3,7 +3,7 @@ #include "std.h" -#include "firmwares/rotorcraft/baro.h" +#include #include "booz/booz2_analog.h" /* we don't need that on this board */ diff --git a/sw/airborne/boards/booz/test_baro.c b/sw/airborne/boards/booz/test_baro.c index 53148e2cbf..93b22f707f 100644 --- a/sw/airborne/boards/booz/test_baro.c +++ b/sw/airborne/boards/booz/test_baro.c @@ -34,7 +34,7 @@ #include "sys_time.h" #include "downlink.h" -#include "firmwares/rotorcraft/baro.h" +#include static inline void main_init( void ); static inline void main_periodic_task( void ); diff --git a/sw/airborne/boards/lisa_l/baro_board.c b/sw/airborne/boards/lisa_l/baro_board.c index 2dd944f909..97a2c37e36 100644 --- a/sw/airborne/boards/lisa_l/baro_board.c +++ b/sw/airborne/boards/lisa_l/baro_board.c @@ -1,5 +1,5 @@ -#include "firmwares/rotorcraft/baro.h" +#include struct Baro baro; struct BaroBoard baro_board; diff --git a/sw/airborne/boards/lisa_l/test_baro.c b/sw/airborne/boards/lisa_l/test_baro.c index 21162f1724..6ea30074fe 100644 --- a/sw/airborne/boards/lisa_l/test_baro.c +++ b/sw/airborne/boards/lisa_l/test_baro.c @@ -34,7 +34,7 @@ #include "downlink.h" -#include "firmwares/rotorcraft/baro.h" +#include //#include "my_debug_servo.h" static inline void main_init( void ); diff --git a/sw/airborne/boards/pc/baro_board.c b/sw/airborne/boards/pc/baro_board.c index dd87d54ffa..210a1a0bcf 100644 --- a/sw/airborne/boards/pc/baro_board.c +++ b/sw/airborne/boards/pc/baro_board.c @@ -1,6 +1,6 @@ -#include "firmwares/rotorcraft/baro.h" +#include struct Baro baro; diff --git a/sw/airborne/booz/arch/lpc21/booz2_analog_hw.c b/sw/airborne/booz/arch/lpc21/booz2_analog_hw.c index f0e6faec6a..49da340b99 100644 --- a/sw/airborne/booz/arch/lpc21/booz2_analog_hw.c +++ b/sw/airborne/booz/arch/lpc21/booz2_analog_hw.c @@ -24,7 +24,7 @@ #include "booz2_analog.h" /* analog_arch includes baro ??? naaaa we don't want double references */ -#include "firmwares/rotorcraft/baro.h" +#include #include #ifndef USE_EXTRA_ADC diff --git a/sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c b/sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c index f412414b9e..eddb9dd451 100644 --- a/sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c +++ b/sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c @@ -22,7 +22,7 @@ * */ -#include "firmwares/rotorcraft/actuators/actuators_pwm.h" +#include #include #include diff --git a/sw/airborne/firmwares/rotorcraft/actuators/supervision.c b/sw/airborne/firmwares/rotorcraft/actuators/supervision.c index 9a114641ee..f21c4f08c8 100644 --- a/sw/airborne/firmwares/rotorcraft/actuators/supervision.c +++ b/sw/airborne/firmwares/rotorcraft/actuators/supervision.c @@ -22,7 +22,7 @@ * */ -#include "firmwares/rotorcraft/actuators/supervision.h" +#include #include "paparazzi.h" //#include diff --git a/sw/airborne/firmwares/rotorcraft/ins.c b/sw/airborne/firmwares/rotorcraft/ins.c index 395683f4d2..d9b816b19e 100644 --- a/sw/airborne/firmwares/rotorcraft/ins.c +++ b/sw/airborne/firmwares/rotorcraft/ins.c @@ -25,7 +25,7 @@ #include #include -#include "firmwares/rotorcraft/baro.h" +#include #include "booz_gps.h" #include "airframe.h" diff --git a/sw/airborne/firmwares/rotorcraft/main.c b/sw/airborne/firmwares/rotorcraft/main.c index a8b2c97d1f..47d2f5974f 100644 --- a/sw/airborne/firmwares/rotorcraft/main.c +++ b/sw/airborne/firmwares/rotorcraft/main.c @@ -59,7 +59,7 @@ #include "booz2_pwm_hw.h" #endif -#include "firmwares/rotorcraft/main.h" +#include #ifdef SITL #include "nps_autopilot_booz.h" diff --git a/sw/airborne/fms/fms_spi_autopilot_msg.c b/sw/airborne/fms/fms_spi_autopilot_msg.c index df6959ba88..b3bd9a8984 100644 --- a/sw/airborne/fms/fms_spi_autopilot_msg.c +++ b/sw/airborne/fms/fms_spi_autopilot_msg.c @@ -42,7 +42,7 @@ #include "airframe.h" /* sort of a hack, we're not really fixed wing here but we need their declarations */ -#include "firmwares/fixedwing/actuators.h" +#include #include "rdyb_booz_imu.h" #include "booz_radio_control.h" #include "rdyb_mahrs.h" diff --git a/sw/airborne/lisa/lisa_stm_passthrough_main.c b/sw/airborne/lisa/lisa_stm_passthrough_main.c index 78582cf169..06a6d5ebb0 100644 --- a/sw/airborne/lisa/lisa_stm_passthrough_main.c +++ b/sw/airborne/lisa/lisa_stm_passthrough_main.c @@ -45,7 +45,7 @@ #include "csc_msg_def.h" #include "csc_protocol.h" -#include "firmwares/rotorcraft/baro.h" +#include #include "adc.h" diff --git a/sw/airborne/lisa/test_servos.c b/sw/airborne/lisa/test_servos.c index d842749f9d..864652a899 100644 --- a/sw/airborne/lisa/test_servos.c +++ b/sw/airborne/lisa/test_servos.c @@ -25,7 +25,7 @@ #include "init_hw.h" #include "sys_time.h" -#include "firmwares/rotorcraft/actuators/actuators_pwm.h" +#include static inline void main_init( void ); static inline void main_periodic( void ); diff --git a/sw/airborne/setup_actuators.c b/sw/airborne/setup_actuators.c index 1a5d6fdfd6..4ae26c8cbc 100644 --- a/sw/airborne/setup_actuators.c +++ b/sw/airborne/setup_actuators.c @@ -3,7 +3,7 @@ #include "interrupt_hw.h" #include "sys_time.h" #include "led.h" -#include "firmwares/fixedwing/actuators.h" +#include //#include "actuators.h" #include "airframe.h" #define DATALINK_C