fix nav.h includes

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"

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"

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"

sw/airborne/arch/sim/sim_baro.c

@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include "estimator.h"
-#include "nav.h"
+#include "subsystems/nav.h"
 #include "gps.h"
 #include "baro_MS5534A.h"
 

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"

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"

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"

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

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"
 

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"
 

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"

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"

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"

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"
 
 

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

sw/airborne/modules/cam_control/cam_roll.c

@@ -28,12 +28,12 @@
 
 #include <math.h>
 #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

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"
 

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

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_ {

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"
 

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;

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"

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))

sw/airborne/subsystems/nav.c

@@ -30,7 +30,7 @@
 
 #include <math.h>
 
-#include "nav.h"
+#include "subsystems/nav.h"
 #include "gps.h"
 #include "estimator.h"
 #include "firmwares/fixedwing/stabilization/stabilization_attitude.h"

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"

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"
 

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;

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 };

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;
 

sw/airborne/test/test_nav.c

@@ -1,5 +1,5 @@
 #include <assert.h>
-#include "nav.h"
+#include "subsystems/nav.h"
 
 #define FloatEqual_3(f1, f2) (fabs(f1 - f2) < 1e-3)