diff --git a/sw/airborne/booz/test/test_vg_adpt.c b/sw/airborne/booz/test/test_vg_adpt.c index 90c477d0a4..f5e326ce1c 100644 --- a/sw/airborne/booz/test/test_vg_adpt.c +++ b/sw/airborne/booz/test/test_vg_adpt.c @@ -28,7 +28,7 @@ #include "std.h" #include "booz_geometry_mixed.h" #define GUIDANCE_V_C -#include "guidance/guidance_v_adpt.h" +#include diff --git a/sw/airborne/booz/test/test_vg_ref.c b/sw/airborne/booz/test/test_vg_ref.c index fdd8fc27b3..ade024dd47 100644 --- a/sw/airborne/booz/test/test_vg_ref.c +++ b/sw/airborne/booz/test/test_vg_ref.c @@ -25,7 +25,7 @@ #include "booz_geometry_mixed.h" #define GUIDANCE_V_C -#include "guidance/guidance_v_ref.h" +#include #define NB_STEP 10000 #define DT (1./GV_FREQ) diff --git a/sw/airborne/firmwares/rotorcraft/guidance.h b/sw/airborne/firmwares/rotorcraft/guidance.h index bd8ce81b08..dc3bd17595 100644 --- a/sw/airborne/firmwares/rotorcraft/guidance.h +++ b/sw/airborne/firmwares/rotorcraft/guidance.h @@ -1,7 +1,7 @@ #ifndef GUIDANCE_H #define GUIDANCE_H -#include "guidance/guidance_h.h" -#include "guidance/guidance_v.h" +#include +#include #endif /* GUIDANCE_H */ diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c b/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c index 4399370c5c..2e220b4b86 100644 --- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c +++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c @@ -23,7 +23,7 @@ #define GUIDANCE_H_C //#define GUIDANCE_H_USE_REF -#include "guidance/guidance_h.h" +#include #include "ahrs.h" #include "booz_stabilization.h" diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h b/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h index 109920d9d9..07ea61d432 100644 --- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h +++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h @@ -27,7 +27,7 @@ #include "math/pprz_algebra_int.h" -#include "guidance/guidance_h_ref.h" +#include #define GUIDANCE_H_MODE_KILL 0 #define GUIDANCE_H_MODE_RATE 1 diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c b/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c index d090636336..ea8f7dc366 100644 --- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c +++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c @@ -23,7 +23,7 @@ #define GUIDANCE_V_C #define GUIDANCE_V_USE_REF -#include "guidance/guidance_v.h" +#include #include "booz_radio_control.h" diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h b/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h index 3e1c41188f..516abddca4 100644 --- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h +++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h @@ -26,8 +26,8 @@ #include "std.h" -#include "guidance/guidance_v_ref.h" -#include "guidance/guidance_v_adpt.h" +#include +#include #define GUIDANCE_V_MODE_KILL 0 #define GUIDANCE_V_MODE_RC_DIRECT 1