diff --git a/conf/autopilot/fixedwing_autopilot.xml b/conf/autopilot/fixedwing_autopilot.xml index 61bbb111a3..b3c776757a 100644 --- a/conf/autopilot/fixedwing_autopilot.xml +++ b/conf/autopilot/fixedwing_autopilot.xml @@ -12,7 +12,7 @@ - + diff --git a/conf/autopilot/fixedwing_rusty.xml b/conf/autopilot/fixedwing_rusty.xml index 3f711588eb..2ea7f00842 100644 --- a/conf/autopilot/fixedwing_rusty.xml +++ b/conf/autopilot/fixedwing_rusty.xml @@ -13,7 +13,7 @@ - + diff --git a/conf/modules/firmwares/fixedwing.xml b/conf/modules/firmwares/fixedwing.xml index 44d62dfeb2..cf869db8ed 100644 --- a/conf/modules/firmwares/fixedwing.xml +++ b/conf/modules/firmwares/fixedwing.xml @@ -22,7 +22,7 @@ - + diff --git a/conf/modules/intermcu_can.xml b/conf/modules/intermcu_can.xml index dd71d7ec70..5fd80d213a 100644 --- a/conf/modules/intermcu_can.xml +++ b/conf/modules/intermcu_can.xml @@ -22,7 +22,7 @@ - + diff --git a/conf/modules/intermcu_spi.xml b/conf/modules/intermcu_spi.xml index 916516510d..7b1bec4915 100644 --- a/conf/modules/intermcu_spi.xml +++ b/conf/modules/intermcu_spi.xml @@ -26,7 +26,7 @@ - + diff --git a/conf/modules/intermcu_uart.xml b/conf/modules/intermcu_uart.xml index f7501cdd80..b358283c7e 100644 --- a/conf/modules/intermcu_uart.xml +++ b/conf/modules/intermcu_uart.xml @@ -19,8 +19,8 @@ intermcu,commands,radio_control
- - + +
@@ -46,7 +46,7 @@ - + @@ -55,19 +55,19 @@ - + - + - + - + diff --git a/conf/modules/stabilization_adaptive_fw.xml b/conf/modules/stabilization_adaptive_fw.xml index ea810886a5..a221986338 100644 --- a/conf/modules/stabilization_adaptive_fw.xml +++ b/conf/modules/stabilization_adaptive_fw.xml @@ -33,7 +33,7 @@ - + diff --git a/conf/modules/stabilization_attitude_fw.xml b/conf/modules/stabilization_attitude_fw.xml index 7ddaf30ab0..f804123e58 100644 --- a/conf/modules/stabilization_attitude_fw.xml +++ b/conf/modules/stabilization_attitude_fw.xml @@ -23,7 +23,7 @@ - + diff --git a/conf/settings/control/ctl_adaptive.xml b/conf/settings/control/ctl_adaptive.xml index ccaeea2dbc..1754b50a76 100644 --- a/conf/settings/control/ctl_adaptive.xml +++ b/conf/settings/control/ctl_adaptive.xml @@ -7,7 +7,7 @@ - + diff --git a/conf/settings/control/ctl_basic.xml b/conf/settings/control/ctl_basic.xml index 5648124b3d..80b781cff0 100644 --- a/conf/settings/control/ctl_basic.xml +++ b/conf/settings/control/ctl_basic.xml @@ -7,7 +7,7 @@ - + diff --git a/conf/settings/control/ctl_energy.xml b/conf/settings/control/ctl_energy.xml index 019ff81f85..3f4f777dc5 100644 --- a/conf/settings/control/ctl_energy.xml +++ b/conf/settings/control/ctl_energy.xml @@ -7,7 +7,7 @@ - + diff --git a/conf/settings/control/ctl_energyadaptive.xml b/conf/settings/control/ctl_energyadaptive.xml index 31d146548d..2713cd4d50 100644 --- a/conf/settings/control/ctl_energyadaptive.xml +++ b/conf/settings/control/ctl_energyadaptive.xml @@ -7,7 +7,7 @@ - + diff --git a/conf/settings/control/ctl_new.xml b/conf/settings/control/ctl_new.xml index 128808aa98..a998149e56 100644 --- a/conf/settings/control/ctl_new.xml +++ b/conf/settings/control/ctl_new.xml @@ -7,7 +7,7 @@ - + diff --git a/conf/settings/control/ctl_new_airspeed.xml b/conf/settings/control/ctl_new_airspeed.xml index 2a01f6060d..f43408a362 100644 --- a/conf/settings/control/ctl_new_airspeed.xml +++ b/conf/settings/control/ctl_new_airspeed.xml @@ -7,7 +7,7 @@ - + diff --git a/sw/airborne/arch/sim/sim_ap.c b/sw/airborne/arch/sim/sim_ap.c index 694f673fe6..5273c4db45 100644 --- a/sw/airborne/arch/sim/sim_ap.c +++ b/sw/airborne/arch/sim/sim_ap.c @@ -10,7 +10,7 @@ #include #include #include "std.h" -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" #include "autopilot.h" #include "modules/gps/gps.h" #include "generated/settings.h" diff --git a/sw/airborne/arch/stm32/link_mcu_hw.h b/sw/airborne/arch/stm32/modules/intermcu/link_mcu_hw.h similarity index 100% rename from sw/airborne/arch/stm32/link_mcu_hw.h rename to sw/airborne/arch/stm32/modules/intermcu/link_mcu_hw.h diff --git a/sw/airborne/firmwares/fixedwing/autopilot_static.c b/sw/airborne/firmwares/fixedwing/autopilot_static.c index 711a62589e..6816c64299 100644 --- a/sw/airborne/firmwares/fixedwing/autopilot_static.c +++ b/sw/airborne/firmwares/fixedwing/autopilot_static.c @@ -29,8 +29,8 @@ #include "autopilot.h" #include "firmwares/fixedwing/autopilot_static.h" -#include "inter_mcu.h" -#include "link_mcu.h" +#include "modules/intermcu/inter_mcu.h" +#include "modules/intermcu/link_mcu.h" #include "state.h" #include "firmwares/fixedwing/nav.h" #include "firmwares/fixedwing/stabilization/stabilization_attitude.h" diff --git a/sw/airborne/firmwares/fixedwing/autopilot_utils.h b/sw/airborne/firmwares/fixedwing/autopilot_utils.h index 2c2ffb86a4..89ae592b01 100644 --- a/sw/airborne/firmwares/fixedwing/autopilot_utils.h +++ b/sw/airborne/firmwares/fixedwing/autopilot_utils.h @@ -30,7 +30,7 @@ #define AUTOPILOT_UTILS_H #include "std.h" -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" #include "generated/airframe.h" /** Get mode from pulse diff --git a/sw/airborne/firmwares/fixedwing/main_ap.c b/sw/airborne/firmwares/fixedwing/main_ap.c index 2a33f21438..f0b6ce4f10 100644 --- a/sw/airborne/firmwares/fixedwing/main_ap.c +++ b/sw/airborne/firmwares/fixedwing/main_ap.c @@ -37,8 +37,8 @@ #include "firmwares/fixedwing/main_ap.h" #include "mcu.h" #include "mcu_periph/sys_time.h" -#include "inter_mcu.h" -#include "link_mcu.h" +#include "modules/intermcu/inter_mcu.h" +#include "modules/intermcu/link_mcu.h" #include "generated/airframe.h" #include "generated/modules.h" diff --git a/sw/airborne/firmwares/fixedwing/main_fbw.c b/sw/airborne/firmwares/fixedwing/main_fbw.c index 2e75cb98f4..9719b663e9 100644 --- a/sw/airborne/firmwares/fixedwing/main_fbw.c +++ b/sw/airborne/firmwares/fixedwing/main_fbw.c @@ -57,8 +57,8 @@ #include "firmwares/fixedwing/fbw_datalink.h" #endif -#include "inter_mcu.h" -#include "link_mcu.h" +#include "modules/intermcu/inter_mcu.h" +#include "modules/intermcu/link_mcu.h" uint8_t fbw_mode; diff --git a/sw/airborne/firmwares/fixedwing/nav.c b/sw/airborne/firmwares/fixedwing/nav.c index 0e00de7858..ea7738fa31 100644 --- a/sw/airborne/firmwares/fixedwing/nav.c +++ b/sw/airborne/firmwares/fixedwing/nav.c @@ -34,7 +34,7 @@ static unit_t unit __attribute__((unused)); #include "firmwares/fixedwing/nav.h" #include "firmwares/fixedwing/stabilization/stabilization_attitude.h" #include "autopilot.h" -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" #include "modules/gps/gps.h" #include "generated/flight_plan.h" diff --git a/sw/airborne/firmwares/rotorcraft/main_fbw.c b/sw/airborne/firmwares/rotorcraft/main_fbw.c index 35c44b0e17..6afca50c77 100644 --- a/sw/airborne/firmwares/rotorcraft/main_fbw.c +++ b/sw/airborne/firmwares/rotorcraft/main_fbw.c @@ -39,7 +39,7 @@ #include "modules/energy/electrical.h" #include "modules/radio_control/radio_control.h" -#include "subsystems/intermcu/intermcu_fbw.h" +#include "modules/intermcu/intermcu_fbw.h" #include "firmwares/rotorcraft/main_fbw.h" #include "firmwares/rotorcraft/autopilot_rc_helpers.h" diff --git a/sw/airborne/modules/airborne_ant_track/airborne_ant_track.c b/sw/airborne/modules/airborne_ant_track/airborne_ant_track.c index 7759983363..c74c48f886 100644 --- a/sw/airborne/modules/airborne_ant_track/airborne_ant_track.c +++ b/sw/airborne/modules/airborne_ant_track/airborne_ant_track.c @@ -19,7 +19,7 @@ #include #include -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" #include "modules/nav/common_nav.h" #include "autopilot.h" #include "generated/flight_plan.h" diff --git a/sw/airborne/modules/boards/opa_controller_ap.c b/sw/airborne/modules/boards/opa_controller_ap.c index e1950389c4..ec74f472eb 100644 --- a/sw/airborne/modules/boards/opa_controller_ap.c +++ b/sw/airborne/modules/boards/opa_controller_ap.c @@ -24,7 +24,7 @@ */ #include "modules/boards/opa_controller_ap.h" -#include "subsystems/intermcu.h" +#include "modules/intermcu/intermcu.h" #include "generated/airframe.h" #include "mcu_periph/gpio.h" diff --git a/sw/airborne/modules/boards/opa_controller_fbw.c b/sw/airborne/modules/boards/opa_controller_fbw.c index 072833686c..8fd1a2072d 100644 --- a/sw/airborne/modules/boards/opa_controller_fbw.c +++ b/sw/airborne/modules/boards/opa_controller_fbw.c @@ -24,7 +24,7 @@ */ #include "modules/boards/opa_controller_fbw.h" -#include "subsystems/intermcu.h" +#include "modules/intermcu/intermcu.h" #include "generated/airframe.h" #include "mcu_periph/gpio.h" #include "led.h" diff --git a/sw/airborne/modules/cam_control/cam.h b/sw/airborne/modules/cam_control/cam.h index c28dec51fa..3e2509cc3d 100644 --- a/sw/airborne/modules/cam_control/cam.h +++ b/sw/airborne/modules/cam_control/cam.h @@ -28,7 +28,7 @@ #define CAM_H #include -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" #define CAM_MODE_OFF 0 /* Do nothing */ #define CAM_MODE_ANGLES 1 /* Input: servo angles */ diff --git a/sw/airborne/modules/cam_control/cam_roll.c b/sw/airborne/modules/cam_control/cam_roll.c index a065bd5d7b..e9d431fbe4 100644 --- a/sw/airborne/modules/cam_control/cam_roll.c +++ b/sw/airborne/modules/cam_control/cam_roll.c @@ -31,7 +31,7 @@ #include "autopilot.h" #include "generated/flight_plan.h" #include "state.h" -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" #ifndef CAM_PHI_MAX #define CAM_PHI_MAX RadOfDeg(45) diff --git a/sw/airborne/modules/com/generic_com.c b/sw/airborne/modules/com/generic_com.c index ae5e02f4d3..622695d9a1 100644 --- a/sw/airborne/modules/com/generic_com.c +++ b/sw/airborne/modules/com/generic_com.c @@ -31,7 +31,7 @@ #include "modules/gps/gps.h" #include "modules/energy/electrical.h" #include "generated/airframe.h" -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" #include "autopilot.h" #include "modules/nav/common_nav.h" diff --git a/sw/airborne/modules/core/rc_settings.c b/sw/airborne/modules/core/rc_settings.c index 5f0ba0c28d..b2ce471394 100644 --- a/sw/airborne/modules/core/rc_settings.c +++ b/sw/airborne/modules/core/rc_settings.c @@ -27,7 +27,7 @@ #include "modules/core/rc_settings.h" #include "autopilot.h" #include "firmwares/fixedwing/nav.h" -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" #include "firmwares/fixedwing/stabilization/stabilization_attitude.h" uint8_t rc_settings_mode = 0; diff --git a/sw/airborne/modules/digital_cam/dc_shoot_rc.c b/sw/airborne/modules/digital_cam/dc_shoot_rc.c index bb8c4407dd..a6236399da 100644 --- a/sw/airborne/modules/digital_cam/dc_shoot_rc.c +++ b/sw/airborne/modules/digital_cam/dc_shoot_rc.c @@ -27,7 +27,7 @@ */ #include "dc_shoot_rc.h" -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" #include "dc.h" #ifndef DC_RADIO_SHOOT diff --git a/sw/airborne/modules/digital_cam/servo_cam_ctrl.c b/sw/airborne/modules/digital_cam/servo_cam_ctrl.c index 40aac3bac2..320f1ed61a 100644 --- a/sw/airborne/modules/digital_cam/servo_cam_ctrl.c +++ b/sw/airborne/modules/digital_cam/servo_cam_ctrl.c @@ -33,7 +33,7 @@ // Include Servo and airframe servo channels #include "std.h" -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" #include "generated/airframe.h" #define DC_PUSH(X) imcu_set_command(X, -MAX_PPRZ); diff --git a/sw/airborne/modules/display/max7456.c b/sw/airborne/modules/display/max7456.c index 69007c9fe2..7a87b97076 100644 --- a/sw/airborne/modules/display/max7456.c +++ b/sw/airborne/modules/display/max7456.c @@ -28,7 +28,7 @@ #include "std.h" //#include "stdio.h" -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" #include "mcu_periph/sys_time.h" #include "mcu_periph/gpio.h" diff --git a/sw/airborne/modules/gas_engine/gas_engine_idle_trim.c b/sw/airborne/modules/gas_engine/gas_engine_idle_trim.c index 11bc8443e5..38c4eb16ed 100644 --- a/sw/airborne/modules/gas_engine/gas_engine_idle_trim.c +++ b/sw/airborne/modules/gas_engine/gas_engine_idle_trim.c @@ -25,7 +25,7 @@ int gas_engine_idle_trim_left = 0; int gas_engine_idle_trim_right = 0; -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" void periodic_gas_engine_idle_trim(void) diff --git a/sw/airborne/modules/ins/ins_arduimu_basic.c b/sw/airborne/modules/ins/ins_arduimu_basic.c index 56b1d476c1..f463b51bc2 100644 --- a/sw/airborne/modules/ins/ins_arduimu_basic.c +++ b/sw/airborne/modules/ins/ins_arduimu_basic.c @@ -35,7 +35,7 @@ // Command vector for thrust #include "generated/airframe.h" -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" #define NB_DATA 9 diff --git a/sw/airborne/inter_mcu.c b/sw/airborne/modules/intermcu/inter_mcu.c similarity index 92% rename from sw/airborne/inter_mcu.c rename to sw/airborne/modules/intermcu/inter_mcu.c index 3464cb4d1e..955905f578 100644 --- a/sw/airborne/inter_mcu.c +++ b/sw/airborne/modules/intermcu/inter_mcu.c @@ -19,12 +19,12 @@ */ /** - * @file inter_mcu.c + * @file modules/intermcu/inter_mcu.c * Communication between fbw and ap processes. * */ -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" #if defined SINGLE_MCU static struct fbw_state _fbw_state; @@ -32,7 +32,7 @@ static struct ap_state _ap_state; struct fbw_state *fbw_state = &_fbw_state; struct ap_state *ap_state = &_ap_state; #else /* SINGLE_MCU */ -#include "link_mcu.h" +#include "modules/intermcu/link_mcu.h" struct fbw_state *fbw_state = &link_mcu_from_fbw_msg.payload.from_fbw; struct ap_state *ap_state = &link_mcu_from_ap_msg.payload.from_ap; #endif /* ! SINGLE_MCU */ diff --git a/sw/airborne/inter_mcu.h b/sw/airborne/modules/intermcu/inter_mcu.h similarity index 99% rename from sw/airborne/inter_mcu.h rename to sw/airborne/modules/intermcu/inter_mcu.h index 6d4d115f72..e9526ef1ab 100644 --- a/sw/airborne/inter_mcu.h +++ b/sw/airborne/modules/intermcu/inter_mcu.h @@ -19,7 +19,7 @@ */ /** - * @file inter_mcu.h + * @file modules/intermcu/inter_mcu.h * Communication between fbw and ap processes. * * This unit contains the data structure used to communicate between the diff --git a/sw/airborne/subsystems/intermcu.h b/sw/airborne/modules/intermcu/intermcu.h similarity index 98% rename from sw/airborne/subsystems/intermcu.h rename to sw/airborne/modules/intermcu/intermcu.h index 7e08100716..7e53aefc3e 100644 --- a/sw/airborne/subsystems/intermcu.h +++ b/sw/airborne/modules/intermcu/intermcu.h @@ -20,7 +20,7 @@ * */ -/** @file subsystems/intermcu.h +/** @file modules/intermcu/intermcu.h * @brief Rotorcraft Inter-MCU interface */ diff --git a/sw/airborne/subsystems/intermcu/intermcu_ap.c b/sw/airborne/modules/intermcu/intermcu_ap.c similarity index 99% rename from sw/airborne/subsystems/intermcu/intermcu_ap.c rename to sw/airborne/modules/intermcu/intermcu_ap.c index 9c80631b89..da272f4931 100644 --- a/sw/airborne/subsystems/intermcu/intermcu_ap.c +++ b/sw/airborne/modules/intermcu/intermcu_ap.c @@ -20,7 +20,7 @@ * */ -/** @file subsystems/intermcu/intermcu_ap.c +/** @file modules/intermcu/intermcu_ap.c * @brief Rotorcraft Inter-MCU on the autopilot */ diff --git a/sw/airborne/subsystems/intermcu/intermcu_ap.h b/sw/airborne/modules/intermcu/intermcu_ap.h similarity index 95% rename from sw/airborne/subsystems/intermcu/intermcu_ap.h rename to sw/airborne/modules/intermcu/intermcu_ap.h index f65e2d92ce..dc5d12887b 100644 --- a/sw/airborne/subsystems/intermcu/intermcu_ap.h +++ b/sw/airborne/modules/intermcu/intermcu_ap.h @@ -20,14 +20,14 @@ * */ -/** @file subsystems/intermcu/intermcu_ap.h +/** @file modules/intermcu/intermcu_ap.h * @brief Rotorcraft Inter-MCU on the autopilot */ #ifndef INTERMCU_AP_ROTORCRAFT_H #define INTERMCU_AP_ROTORCRAFT_H -#include "subsystems/intermcu.h" +#include "modules/intermcu/intermcu.h" #include "generated/airframe.h" #include "modules/energy/electrical.h" diff --git a/sw/airborne/subsystems/intermcu/intermcu_fbw.c b/sw/airborne/modules/intermcu/intermcu_fbw.c similarity index 99% rename from sw/airborne/subsystems/intermcu/intermcu_fbw.c rename to sw/airborne/modules/intermcu/intermcu_fbw.c index 13358a0b89..819e0015a5 100644 --- a/sw/airborne/subsystems/intermcu/intermcu_fbw.c +++ b/sw/airborne/modules/intermcu/intermcu_fbw.c @@ -20,7 +20,7 @@ * */ -/** @file subsystems/intermcu/intermcu_fbw.c +/** @file modules/intermcu/intermcu_fbw.c * @brief Rotorcraft Inter-MCU on FlyByWire */ diff --git a/sw/airborne/subsystems/intermcu/intermcu_fbw.h b/sw/airborne/modules/intermcu/intermcu_fbw.h similarity index 95% rename from sw/airborne/subsystems/intermcu/intermcu_fbw.h rename to sw/airborne/modules/intermcu/intermcu_fbw.h index 714cb0b83b..cf6fb8599b 100644 --- a/sw/airborne/subsystems/intermcu/intermcu_fbw.h +++ b/sw/airborne/modules/intermcu/intermcu_fbw.h @@ -20,14 +20,14 @@ * */ -/** @file subsystems/intermcu/intermcu_fbw.h +/** @file modules/intermcu/intermcu_fbw.h * @brief Rotorcraft Inter-MCU on FlyByWire */ #ifndef INTERMCU_FBW_ROTORCRAFT_H #define INTERMCU_FBW_ROTORCRAFT_H -#include "subsystems/intermcu.h" +#include "modules/intermcu/intermcu.h" extern bool autopilot_motors_on; extern pprz_t intermcu_commands[COMMANDS_NB]; diff --git a/sw/airborne/link_mcu.h b/sw/airborne/modules/intermcu/link_mcu.h similarity index 96% rename from sw/airborne/link_mcu.h rename to sw/airborne/modules/intermcu/link_mcu.h index 8ceb91197b..9642527e17 100644 --- a/sw/airborne/link_mcu.h +++ b/sw/airborne/modules/intermcu/link_mcu.h @@ -19,7 +19,7 @@ */ /** - * @file link_mcu.h + * @file modules/intermcu/link_mcu.h * Common transport functions for the communication between FBW and AP. */ diff --git a/sw/airborne/link_mcu_can.c b/sw/airborne/modules/intermcu/link_mcu_can.c similarity index 99% rename from sw/airborne/link_mcu_can.c rename to sw/airborne/modules/intermcu/link_mcu_can.c index 0b9713d8c1..a65734155b 100644 --- a/sw/airborne/link_mcu_can.c +++ b/sw/airborne/modules/intermcu/link_mcu_can.c @@ -20,7 +20,7 @@ * */ -#include "link_mcu_can.h" +#include "modules/intermcu/link_mcu_can.h" #include "mcu_periph/can.h" #include "led.h" diff --git a/sw/airborne/link_mcu_can.h b/sw/airborne/modules/intermcu/link_mcu_can.h similarity index 94% rename from sw/airborne/link_mcu_can.h rename to sw/airborne/modules/intermcu/link_mcu_can.h index 82aa28b581..9234ec9ee6 100644 --- a/sw/airborne/link_mcu_can.h +++ b/sw/airborne/modules/intermcu/link_mcu_can.h @@ -19,7 +19,7 @@ */ /** - * @file link_mcu_can.h + * @file modules/intermcu/link_mcu_can.h * Transport for the communication between FBW and AP via CAN. * */ @@ -28,7 +28,7 @@ #define LINK_MCU_CAN_H #include -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" struct link_mcu_msg { union { diff --git a/sw/airborne/link_mcu_spi.c b/sw/airborne/modules/intermcu/link_mcu_spi.c similarity index 99% rename from sw/airborne/link_mcu_spi.c rename to sw/airborne/modules/intermcu/link_mcu_spi.c index e9f11551e0..e77a8a7dfc 100644 --- a/sw/airborne/link_mcu_spi.c +++ b/sw/airborne/modules/intermcu/link_mcu_spi.c @@ -20,7 +20,7 @@ * */ -#include "link_mcu_spi.h" +#include "modules/intermcu/link_mcu_spi.h" #ifndef LINK_MCU_SPI_DEV #define LINK_MCU_SPI_DEV spi1 diff --git a/sw/airborne/link_mcu_spi.h b/sw/airborne/modules/intermcu/link_mcu_spi.h similarity index 92% rename from sw/airborne/link_mcu_spi.h rename to sw/airborne/modules/intermcu/link_mcu_spi.h index 5eeff0b527..dae3dcd48c 100644 --- a/sw/airborne/link_mcu_spi.h +++ b/sw/airborne/modules/intermcu/link_mcu_spi.h @@ -19,7 +19,7 @@ */ /** - * @file link_mcu_spi.h + * @file modules/intermcu/link_mcu_spi.h * Transport for the communication between FBW and AP via SPI. * */ @@ -28,11 +28,11 @@ #define LINK_MCU_SPI_H #include -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" #include "mcu_periph/spi.h" #ifndef SITL -#include "link_mcu_hw.h" +#include "modules/intermcu/link_mcu_hw.h" #endif struct link_mcu_msg { diff --git a/sw/airborne/link_mcu_usart.c b/sw/airborne/modules/intermcu/link_mcu_usart.c similarity index 99% rename from sw/airborne/link_mcu_usart.c rename to sw/airborne/modules/intermcu/link_mcu_usart.c index cc4ced67b0..ed3fdd76ea 100644 --- a/sw/airborne/link_mcu_usart.c +++ b/sw/airborne/modules/intermcu/link_mcu_usart.c @@ -20,7 +20,7 @@ * */ -#include "link_mcu_usart.h" +#include "modules/intermcu/link_mcu_usart.h" #include "mcu_periph/uart.h" #include "led.h" diff --git a/sw/airborne/link_mcu_usart.h b/sw/airborne/modules/intermcu/link_mcu_usart.h similarity index 94% rename from sw/airborne/link_mcu_usart.h rename to sw/airborne/modules/intermcu/link_mcu_usart.h index 558e17d578..d0741a3b93 100644 --- a/sw/airborne/link_mcu_usart.h +++ b/sw/airborne/modules/intermcu/link_mcu_usart.h @@ -19,7 +19,7 @@ */ /** - * @file link_mcu_usart.h + * @file modules/intermcu/link_mcu_usart.h * Transport for the communication between FBW and AP via UART. * */ @@ -28,7 +28,7 @@ #define LINK_MCU_USART_H #include -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" struct link_mcu_msg { union { diff --git a/sw/airborne/modules/nav/nav_drop.c b/sw/airborne/modules/nav/nav_drop.c index 4b9bcf03bb..465d073353 100644 --- a/sw/airborne/modules/nav/nav_drop.c +++ b/sw/airborne/modules/nav/nav_drop.c @@ -30,7 +30,7 @@ #include "state.h" #include "generated/flight_plan.h" #include "generated/airframe.h" -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" #if defined WP_RELEASE diff --git a/sw/airborne/modules/px4_flash/px4_flash.c b/sw/airborne/modules/px4_flash/px4_flash.c index a4063ddf91..1b614a75cb 100644 --- a/sw/airborne/modules/px4_flash/px4_flash.c +++ b/sw/airborne/modules/px4_flash/px4_flash.c @@ -27,7 +27,7 @@ #include "modules/px4_flash/px4_flash.h" #include "modules/px4_flash/protocol.h" #include "mcu_periph/sys_time_arch.h" -#include "subsystems/intermcu/intermcu_ap.h" +#include "modules/intermcu/intermcu_ap.h" // Serial Port #include "mcu_periph/uart.h" diff --git a/sw/airborne/modules/spektrum_soft_bind/spektrum_soft_bind_ap.c b/sw/airborne/modules/spektrum_soft_bind/spektrum_soft_bind_ap.c index 2fa45cd2e0..0afb39738f 100644 --- a/sw/airborne/modules/spektrum_soft_bind/spektrum_soft_bind_ap.c +++ b/sw/airborne/modules/spektrum_soft_bind/spektrum_soft_bind_ap.c @@ -24,7 +24,7 @@ */ #include "modules/spektrum_soft_bind/spektrum_soft_bind_ap.h" -#include "subsystems/intermcu/intermcu_ap.h" +#include "modules/intermcu/intermcu_ap.h" #include "led.h" #include "mcu.h" diff --git a/sw/airborne/modules/spektrum_soft_bind/spektrum_soft_bind_fbw.c b/sw/airborne/modules/spektrum_soft_bind/spektrum_soft_bind_fbw.c index 921a4cb27d..d3b6fca960 100644 --- a/sw/airborne/modules/spektrum_soft_bind/spektrum_soft_bind_fbw.c +++ b/sw/airborne/modules/spektrum_soft_bind/spektrum_soft_bind_fbw.c @@ -24,7 +24,7 @@ */ #include "modules/spektrum_soft_bind/spektrum_soft_bind_fbw.h" -#include "subsystems/intermcu/intermcu_fbw.h" +#include "modules/intermcu/intermcu_fbw.h" #include "mcu.h" #include "modules/radio_control/radio_control.h" #include "mcu_periph/sys_time_arch.h" diff --git a/sw/airborne/modules/switching/auto1_commands.c b/sw/airborne/modules/switching/auto1_commands.c index 91899fba8b..fe12f4f298 100644 --- a/sw/airborne/modules/switching/auto1_commands.c +++ b/sw/airborne/modules/switching/auto1_commands.c @@ -23,7 +23,7 @@ #include "auto1_commands.h" #include "generated/airframe.h" #include "autopilot.h" -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" void periodic_auto1_commands(void) { diff --git a/sw/airborne/modules/telemetry/telemetry_intermcu_ap.c b/sw/airborne/modules/telemetry/telemetry_intermcu_ap.c index 9ef17eb72b..d62459f2cc 100644 --- a/sw/airborne/modules/telemetry/telemetry_intermcu_ap.c +++ b/sw/airborne/modules/telemetry/telemetry_intermcu_ap.c @@ -27,7 +27,7 @@ #define PERIODIC_C_INTERMCU #include "telemetry_intermcu.h" #include "telemetry_intermcu_ap.h" -#include "subsystems/intermcu.h" +#include "modules/intermcu/intermcu.h" #include "pprzlink/intermcu_msg.h" #include "pprzlink/short_transport.h" #include "generated/periodic_telemetry.h" diff --git a/sw/airborne/modules/telemetry/telemetry_intermcu_fbw.c b/sw/airborne/modules/telemetry/telemetry_intermcu_fbw.c index a4a80d2d75..290d860ded 100644 --- a/sw/airborne/modules/telemetry/telemetry_intermcu_fbw.c +++ b/sw/airborne/modules/telemetry/telemetry_intermcu_fbw.c @@ -25,7 +25,7 @@ */ #include "telemetry_intermcu.h" -#include "subsystems/intermcu.h" +#include "modules/intermcu/intermcu.h" #include "pprzlink/pprz_transport.h" #include "pprzlink/intermcu_msg.h" #include "modules/datalink/telemetry.h" diff --git a/sw/airborne/modules/uav_recovery/uav_recovery.c b/sw/airborne/modules/uav_recovery/uav_recovery.c index ec20e73acf..17b7ade8a9 100644 --- a/sw/airborne/modules/uav_recovery/uav_recovery.c +++ b/sw/airborne/modules/uav_recovery/uav_recovery.c @@ -31,7 +31,7 @@ #include "modules/nav/common_nav.h" #include "generated/flight_plan.h" #include "generated/airframe.h" -#include "inter_mcu.h" +#include "modules/intermcu/inter_mcu.h" #include "modules/datalink/datalink.h" #include "modules/multi/traffic_info.h" #include "uav_recovery.h"