diff --git a/sw/airborne/anemotaxis.c b/sw/airborne/anemotaxis.c index 33576a6cab..139e8fba2a 100644 --- a/sw/airborne/anemotaxis.c +++ b/sw/airborne/anemotaxis.c @@ -2,7 +2,7 @@ #include "airframe.h" #include "estimator.h" #include "std.h" -#include "nav.h" +#include "subsystems/nav.h" #include "flight_plan.h" #include "ap_downlink.h" #include "chemo_detect.h" diff --git a/sw/airborne/arch/sim/jsbsim_hw.h b/sw/airborne/arch/sim/jsbsim_hw.h index e3da9ce560..1612287b48 100644 --- a/sw/airborne/arch/sim/jsbsim_hw.h +++ b/sw/airborne/arch/sim/jsbsim_hw.h @@ -37,7 +37,7 @@ #include "flight_plan.h" #include "airframe.h" #include "settings.h" -#include "nav.h" +#include "subsystems/nav.h" #include "firmwares/fixedwing/stabilization/stabilization_attitude.h" #include "firmwares/fixedwing/guidance/guidance_v.h" #include "infrared.h" diff --git a/sw/airborne/arch/sim/sim_ap.c b/sw/airborne/arch/sim/sim_ap.c index 40321954f7..9135845934 100644 --- a/sw/airborne/arch/sim/sim_ap.c +++ b/sw/airborne/arch/sim/sim_ap.c @@ -15,7 +15,7 @@ #include "traffic_info.h" #include "flight_plan.h" #include "settings.h" -#include "nav.h" +#include "subsystems/nav.h" #include "firmwares/fixedwing/stabilization/stabilization_attitude.h" #include "firmwares/fixedwing/guidance/guidance_v.h" #include "infrared.h" diff --git a/sw/airborne/arch/sim/sim_baro.c b/sw/airborne/arch/sim/sim_baro.c index d6e737e3b0..e117d97a18 100644 --- a/sw/airborne/arch/sim/sim_baro.c +++ b/sw/airborne/arch/sim/sim_baro.c @@ -1,6 +1,6 @@ #include #include "estimator.h" -#include "nav.h" +#include "subsystems/nav.h" #include "gps.h" #include "baro_MS5534A.h" diff --git a/sw/airborne/arch/sim/sim_jsbsim.c b/sw/airborne/arch/sim/sim_jsbsim.c index ddde9cc059..a6058cd7d9 100644 --- a/sw/airborne/arch/sim/sim_jsbsim.c +++ b/sw/airborne/arch/sim/sim_jsbsim.c @@ -15,7 +15,7 @@ #include "traffic_info.h" #include "flight_plan.h" #include "settings.h" -#include "nav.h" +#include "subsystems/nav.h" #include "firmwares/fixedwing/stabilization/stabilization_attitude.h" #include "ffirmwares/fixedwing/guidance/guidance_v.h" #include "infrared.h" diff --git a/sw/airborne/bomb.c b/sw/airborne/bomb.c index edfc2dae2b..8c24217e98 100644 --- a/sw/airborne/bomb.c +++ b/sw/airborne/bomb.c @@ -23,7 +23,7 @@ */ #include "estimator.h" -#include "nav.h" +#include "subsystems/nav.h" #include "bomb.h" #include "flight_plan.h" #include "airframe.h" diff --git a/sw/airborne/chemotaxis.c b/sw/airborne/chemotaxis.c index e2865ab1b9..39219fcee6 100644 --- a/sw/airborne/chemotaxis.c +++ b/sw/airborne/chemotaxis.c @@ -2,7 +2,7 @@ #include "airframe.h" #include "estimator.h" #include "std.h" -#include "nav.h" +#include "subsystems/nav.h" #include "flight_plan.h" #include "ap_downlink.h" #include "chemo_detect.h" diff --git a/sw/airborne/estimator.c b/sw/airborne/estimator.c index 589f558238..05f335a97f 100644 --- a/sw/airborne/estimator.c +++ b/sw/airborne/estimator.c @@ -33,7 +33,7 @@ #include "uart.h" #include "ap_downlink.h" #include "gps.h" -#include "nav.h" +#include "subsystems/nav.h" #ifdef EXTRA_DOWNLINK_DEVICE #include "core/extra_pprz_dl.h" #endif diff --git a/sw/airborne/firmwares/fixedwing/guidance/guidance_v.c b/sw/airborne/firmwares/fixedwing/guidance/guidance_v.c index 518e267070..0823cc0910 100644 --- a/sw/airborne/firmwares/fixedwing/guidance/guidance_v.c +++ b/sw/airborne/firmwares/fixedwing/guidance/guidance_v.c @@ -30,7 +30,7 @@ #include "firmwares/fixedwing/guidance/guidance_v.h" #include "estimator.h" -#include "nav.h" +#include "subsystems/nav.h" #include "airframe.h" #include "firmwares/fixedwing/autopilot.h" diff --git a/sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c b/sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c index 3473a4c83d..74dddfa954 100644 --- a/sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c +++ b/sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c @@ -31,7 +31,7 @@ #include "firmwares/fixedwing/guidance/guidance_v.h" #include "firmwares/fixedwing/guidance/guidance_v_n.h" #include "estimator.h" -#include "nav.h" +#include "subsystems/nav.h" #include "airframe.h" #include "autopilot.h" diff --git a/sw/airborne/firmwares/fixedwing/main_ap.c b/sw/airborne/firmwares/fixedwing/main_ap.c index c3fc5019e4..08f85429b6 100644 --- a/sw/airborne/firmwares/fixedwing/main_ap.c +++ b/sw/airborne/firmwares/fixedwing/main_ap.c @@ -44,7 +44,7 @@ #include "infrared.h" #include "gyro.h" #include "ap_downlink.h" -#include "nav.h" +#include "subsystems/nav.h" #include "autopilot.h" #include "estimator.h" #include "settings.h" diff --git a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c index 41353eb09a..8a02a919d2 100644 --- a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c +++ b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c @@ -33,7 +33,7 @@ #include "firmwares/fixedwing/stabilization/stabilization_attitude.h" #include "firmwares/fixedwing/stabilization/stabilization_adaptive.h" #include "estimator.h" -#include "nav.h" +#include "subsystems/nav.h" #include "airframe.h" #include "firmwares/fixedwing/guidance/guidance_v.h" #include "autopilot.h" diff --git a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c index 4469c6c31e..900b422c25 100644 --- a/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c +++ b/sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c @@ -32,7 +32,7 @@ #include "std.h" #include "led.h" #include "estimator.h" -#include "nav.h" +#include "subsystems/nav.h" #include "airframe.h" #include "firmwares/fixedwing/guidance/guidance_v.h" #include "firmwares/fixedwing/autopilot.h" diff --git a/sw/airborne/gps_nmea.c b/sw/airborne/gps_nmea.c index 141d97a918..675840f64a 100644 --- a/sw/airborne/gps_nmea.c +++ b/sw/airborne/gps_nmea.c @@ -46,7 +46,7 @@ #include "uart.h" #include "gps.h" //include "gps_ubx.h" -#include "nav.h" +#include "subsystems/nav.h" #include "latlong.h" diff --git a/sw/airborne/gps_ubx.c b/sw/airborne/gps_ubx.c index 0e8efc5ac9..f719046d18 100644 --- a/sw/airborne/gps_ubx.c +++ b/sw/airborne/gps_ubx.c @@ -41,7 +41,7 @@ #include "uart.h" #include "gps.h" #include "gps_ubx.h" -#include "nav.h" +#include "subsystems/nav.h" #include "latlong.h" #ifdef GPS_TIMESTAMP diff --git a/sw/airborne/modules/cam_control/cam_roll.c b/sw/airborne/modules/cam_control/cam_roll.c index feab0bf050..93b6f3ff8c 100644 --- a/sw/airborne/modules/cam_control/cam_roll.c +++ b/sw/airborne/modules/cam_control/cam_roll.c @@ -28,12 +28,12 @@ #include #include "cam.h" -#include "nav.h" +#include "subsystems/nav.h" #include "autopilot.h" #include "flight_plan.h" #include "estimator.h" #include "inter_mcu.h" -#include "nav.h" +#include "subsystems/nav.h" #define MIN_PPRZ_CAM ((int16_t)(MAX_PPRZ * 0.05)) #define DELTA_ALPHA 0.2 diff --git a/sw/airborne/modules/ins/ins_osam_ugear.c b/sw/airborne/modules/ins/ins_osam_ugear.c index e56df47d51..88d46a2493 100644 --- a/sw/airborne/modules/ins/ins_osam_ugear.c +++ b/sw/airborne/modules/ins/ins_osam_ugear.c @@ -36,7 +36,7 @@ #include "latlong.h" #include "sys_time.h" #include "airframe.h" -#include "nav.h" +#include "subsystems/nav.h" #include "estimator.h" #include "xsens_protocol.h" diff --git a/sw/airborne/modules/multi/formation.h b/sw/airborne/modules/multi/formation.h index 6a81365a7f..c1aa59b27c 100644 --- a/sw/airborne/modules/multi/formation.h +++ b/sw/airborne/modules/multi/formation.h @@ -7,7 +7,7 @@ #ifndef FORMATION_H #define FORMATION_H -#include "nav.h" +#include "subsystems/nav.h" #include "traffic_info.h" #define FORM_MODE_GLOBAL 0 diff --git a/sw/airborne/modules/multi/potential.h b/sw/airborne/modules/multi/potential.h index 91aee88d60..736940eef3 100644 --- a/sw/airborne/modules/multi/potential.h +++ b/sw/airborne/modules/multi/potential.h @@ -7,7 +7,7 @@ #ifndef POTENTIAL_H #define POTENTIAL_H -#include "nav.h" +#include "subsystems/nav.h" #include "traffic_info.h" struct force_ { diff --git a/sw/airborne/modules/multi/tcas.c b/sw/airborne/modules/multi/tcas.c index 7b2e239ce2..406ec0f790 100644 --- a/sw/airborne/modules/multi/tcas.c +++ b/sw/airborne/modules/multi/tcas.c @@ -30,7 +30,7 @@ #include "multi/tcas.h" #include "airframe.h" #include "estimator.h" -#include "nav.h" +#include "subsystems/nav.h" #include "gps.h" #include "flight_plan.h" diff --git a/sw/airborne/modules/sensors/baro_MS5534A.c b/sw/airborne/modules/sensors/baro_MS5534A.c index d44dde9dc9..706ce3800a 100644 --- a/sw/airborne/modules/sensors/baro_MS5534A.c +++ b/sw/airborne/modules/sensors/baro_MS5534A.c @@ -34,7 +34,7 @@ #ifndef BARO_NO_DOWNLINK #include "ap_downlink.h" #endif -#include "nav.h" +#include "subsystems/nav.h" #include "estimator.h" bool_t baro_MS5534A_do_reset; diff --git a/sw/airborne/rc_settings.c b/sw/airborne/rc_settings.c index e452b94fe1..82be227638 100644 --- a/sw/airborne/rc_settings.c +++ b/sw/airborne/rc_settings.c @@ -29,7 +29,7 @@ #include "radio.h" #include "autopilot.h" #include "infrared.h" -#include "nav.h" +#include "subsystems/nav.h" #include "estimator.h" #include "inter_mcu.h" #include "firmwares/fixedwing/stabilization/stabilization_attitude.h" diff --git a/sw/airborne/snav.c b/sw/airborne/snav.c index c30df19b73..f8892af0b7 100644 --- a/sw/airborne/snav.c +++ b/sw/airborne/snav.c @@ -5,7 +5,7 @@ #include "airframe.h" #include "snav.h" #include "estimator.h" -#include "nav.h" +#include "subsystems/nav.h" #include "gps.h" #define Sign(_x) ((_x) > 0 ? 1 : (-1)) diff --git a/sw/airborne/subsystems/nav.c b/sw/airborne/subsystems/nav.c index f277c2f4af..ed6173a489 100644 --- a/sw/airborne/subsystems/nav.c +++ b/sw/airborne/subsystems/nav.c @@ -30,7 +30,7 @@ #include -#include "nav.h" +#include "subsystems/nav.h" #include "gps.h" #include "estimator.h" #include "firmwares/fixedwing/stabilization/stabilization_attitude.h" diff --git a/sw/airborne/subsystems/navigation/OSAMNav.h b/sw/airborne/subsystems/navigation/OSAMNav.h index ee2c61efdb..5689d3b807 100644 --- a/sw/airborne/subsystems/navigation/OSAMNav.h +++ b/sw/airborne/subsystems/navigation/OSAMNav.h @@ -2,7 +2,7 @@ #define OSAMNav_H #include "std.h" -#include "nav.h" +#include "subsystems/nav.h" #include "estimator.h" #include "autopilot.h" #include "flight_plan.h" diff --git a/sw/airborne/subsystems/navigation/discsurvey.c b/sw/airborne/subsystems/navigation/discsurvey.c index 2effed1401..643eb406f1 100644 --- a/sw/airborne/subsystems/navigation/discsurvey.c +++ b/sw/airborne/subsystems/navigation/discsurvey.c @@ -3,7 +3,7 @@ #include "airframe.h" #include "estimator.h" #include "std.h" -#include "nav.h" +#include "subsystems/nav.h" #include "flight_plan.h" #include "ap_downlink.h" diff --git a/sw/airborne/subsystems/navigation/nav_cube.c b/sw/airborne/subsystems/navigation/nav_cube.c index 35a5711e88..7be42b7e78 100644 --- a/sw/airborne/subsystems/navigation/nav_cube.c +++ b/sw/airborne/subsystems/navigation/nav_cube.c @@ -29,7 +29,7 @@ #include "airframe.h" #include "subsystems/navigation/nav_cube.h" -#include "nav.h" +#include "subsystems/nav.h" #include "flight_plan.h" int32_t cube_alpha; diff --git a/sw/airborne/subsystems/navigation/nav_line.c b/sw/airborne/subsystems/navigation/nav_line.c index aeead0d290..7b5a873399 100644 --- a/sw/airborne/subsystems/navigation/nav_line.c +++ b/sw/airborne/subsystems/navigation/nav_line.c @@ -29,7 +29,7 @@ #include "airframe.h" #include "subsystems/navigation/nav_line.h" -#include "nav.h" +#include "subsystems/nav.h" /** Status along the pattern */ enum line_status { LR12, LQC21, LTC2, LQC22, LR21, LQC12, LTC1, LQC11 }; diff --git a/sw/airborne/subsystems/navigation/nav_survey_rectangle.h b/sw/airborne/subsystems/navigation/nav_survey_rectangle.h index ce14d2ea0b..21b8f07c3d 100644 --- a/sw/airborne/subsystems/navigation/nav_survey_rectangle.h +++ b/sw/airborne/subsystems/navigation/nav_survey_rectangle.h @@ -3,7 +3,7 @@ #ifndef NAV_SURVEY_RECTANGLE_H #define NAV_SURVEY_RECTANGLE_H -#include "nav.h" +#include "subsystems/nav.h" typedef enum {NS, WE} survey_orientation_t; diff --git a/sw/airborne/test/test_nav.c b/sw/airborne/test/test_nav.c index d50ace20a1..d3026c2b60 100644 --- a/sw/airborne/test/test_nav.c +++ b/sw/airborne/test/test_nav.c @@ -1,5 +1,5 @@ #include -#include "nav.h" +#include "subsystems/nav.h" #define FloatEqual_3(f1, f2) (fabs(f1 - f2) < 1e-3)