From f638a40b837d5836fea6bf8afa5dffd5a4e9f2db Mon Sep 17 00:00:00 2001 From: Gautier Hattenberger Date: Wed, 10 Nov 2021 17:03:28 +0100 Subject: [PATCH] [modules] move radio control to modules --- conf/autopilot/rotorcraft_autopilot.xml | 2 +- conf/autopilot/rover.xml | 2 +- conf/autopilot/rover_holonomic.xml | 2 +- conf/flight_plans/quadshot_delft.xml | 2 +- .../tudelft/course_orangeavoid_cyberzoo.xml | 2 +- .../course_orangeavoid_cyberzoo_guided.xml | 2 +- conf/flight_plans/tudelft/delft_basic.xml | 2 +- conf/flight_plans/tudelft/delft_bebop.xml | 2 +- .../tudelft/nederdrone_cyberzoo.xml | 2 +- .../ralphthesis2020_stereo_cyberzoo.xml | 2 +- .../tudelft/rotorcraft_optitrack_path.xml | 2 +- conf/flight_plans/tudelft/train_safe_zoo.xml | 2 +- conf/modules/intermcu_uart.xml | 2 +- conf/modules/radio_control_cc2500_frsky.xml | 32 +++++++++---------- conf/modules/radio_control_datalink.xml | 14 ++++---- conf/modules/radio_control_hott.xml | 18 +++++------ conf/modules/radio_control_ppm.xml | 18 +++++------ conf/modules/radio_control_sbus.xml | 18 +++++------ conf/modules/radio_control_sbus_dual.xml | 18 +++++------ conf/modules/radio_control_spektrum.xml | 24 +++++++------- conf/modules/radio_control_superbitrf_rc.xml | 16 +++++----- .../radio_control/ppm_arch.c | 6 ++-- .../radio_control/ppm_arch.h | 2 +- .../radio_control/ppm_arch.c | 6 ++-- .../radio_control/ppm_arch.h | 2 +- .../radio_control/rc_datalink.c | 2 +- .../radio_control/spektrum_arch.c | 8 ++--- .../radio_control/spektrum_arch.h | 2 +- .../radio_control/ppm_arch.c | 6 ++-- .../radio_control/ppm_arch.h | 2 +- sw/airborne/autopilot.c | 2 +- .../firmwares/fixedwing/autopilot_generated.c | 2 +- .../fixedwing/autopilot_rc_helpers.h | 2 +- sw/airborne/firmwares/fixedwing/main_fbw.c | 2 +- .../firmwares/rotorcraft/autopilot_firmware.c | 2 +- .../rotorcraft/autopilot_generated.c | 2 +- .../rotorcraft/autopilot_rc_helpers.h | 2 +- .../firmwares/rotorcraft/autopilot_static.c | 2 +- .../firmwares/rotorcraft/autopilot_utils.c | 2 +- .../rotorcraft/guidance/guidance_h.c | 2 +- .../rotorcraft/guidance/guidance_hybrid.c | 2 +- .../rotorcraft/guidance/guidance_indi.c | 2 +- .../guidance/guidance_indi_hybrid.c | 2 +- .../rotorcraft/guidance/guidance_v.c | 2 +- sw/airborne/firmwares/rotorcraft/main_ap.c | 2 +- sw/airborne/firmwares/rotorcraft/main_fbw.c | 2 +- .../stabilization_attitude_rc_setpoint.c | 2 +- .../stabilization/stabilization_indi.c | 2 +- .../stabilization/stabilization_indi_simple.c | 2 +- .../stabilization/stabilization_none.c | 2 +- .../stabilization/stabilization_rate.c | 2 +- .../firmwares/rover/autopilot_firmware.c | 2 +- .../firmwares/rover/autopilot_generated.c | 2 +- .../firmwares/rover/autopilot_rc_helpers.h | 2 +- sw/airborne/firmwares/rover/autopilot_utils.c | 2 +- sw/airborne/firmwares/rover/main_ap.c | 2 +- sw/airborne/inter_mcu.h | 2 +- sw/airborne/mcu.c | 2 +- .../ctrl/ctrl_effectiveness_scheduling.c | 2 +- .../modules/ctrl/ctrl_module_innerloop_demo.c | 2 +- .../modules/ctrl/ctrl_module_outerloop_demo.c | 2 +- sw/airborne/modules/ctrl/ctrl_windtunnel.c | 2 +- sw/airborne/modules/ctrl/gain_scheduling.c | 2 +- sw/airborne/modules/datalink/mavlink.c | 4 +-- .../decawave_anchorless_communication.c | 2 +- .../modules/glide_wing_lock/glide_wing_lock.c | 2 +- .../modules/helicopter/throttle_curve.c | 2 +- sw/airborne/modules/light/led_safety_status.c | 2 +- sw/airborne/modules/px4_gimbal/px4_gimbal.c | 2 +- .../cc2500_frsky/cc2500_common.c | 0 .../cc2500_frsky/cc2500_common.h | 0 .../cc2500_frsky/cc2500_compat.c | 0 .../cc2500_frsky/cc2500_compat.h | 0 .../cc2500_frsky/cc2500_frsky_common.h | 0 .../cc2500_frsky/cc2500_frsky_d.h | 0 .../cc2500_frsky/cc2500_frsky_shared.c | 0 .../cc2500_frsky/cc2500_frsky_shared.h | 0 .../cc2500_frsky/cc2500_frsky_x.c | 0 .../cc2500_frsky/cc2500_frsky_x.h | 0 .../cc2500_frsky/cc2500_paparazzi.c | 2 +- .../cc2500_frsky/cc2500_paparazzi.h | 0 .../radio_control/cc2500_frsky/cc2500_rx.c | 0 .../radio_control/cc2500_frsky/cc2500_rx.h | 0 .../cc2500_frsky/cc2500_rx_spi.c | 0 .../cc2500_frsky/cc2500_rx_spi.h | 0 .../cc2500_frsky/cc2500_rx_spi_common.c | 0 .../cc2500_frsky/cc2500_rx_spi_common.h | 0 .../cc2500_frsky/cc2500_settings.c | 0 .../cc2500_frsky/cc2500_settings.h | 0 .../cc2500_frsky/cc2500_smartport.c | 0 .../cc2500_frsky/cc2500_smartport.h | 0 .../radio_control/dummy.c | 2 +- .../radio_control/dummy.h | 0 .../radio_control/hott.c | 6 ++-- .../radio_control/hott.h | 4 +-- .../radio_control/hott_common.c | 6 ++-- .../radio_control/hott_common.h | 2 +- .../radio_control/ppm.c | 6 ++-- .../radio_control/ppm.h | 2 +- .../radio_control}/radio_control.c | 4 +-- .../radio_control}/radio_control.h | 0 .../radio_control/rc_datalink.c | 6 ++-- .../radio_control/rc_datalink.h | 2 +- .../radio_control/sbus.c | 6 ++-- .../radio_control/sbus.h | 4 +-- .../radio_control/sbus_common.c | 6 ++-- .../radio_control/sbus_common.h | 2 +- .../radio_control/sbus_dual.c | 6 ++-- .../radio_control/sbus_dual.h | 4 +-- .../radio_control/spektrum.c | 6 ++-- .../radio_control/spektrum.h | 2 +- .../radio_control/spektrum_radio.h | 2 +- .../radio_control/superbitrf_rc.c | 4 +-- .../radio_control/superbitrf_rc.h | 2 +- .../spektrum_soft_bind_ap.c | 2 +- .../spektrum_soft_bind_fbw.c | 2 +- sw/airborne/peripherals/cyrf6936.c | 2 +- sw/airborne/subsystems/datalink/datalink.c | 2 +- sw/airborne/subsystems/intermcu/intermcu_ap.c | 2 +- .../subsystems/intermcu/intermcu_fbw.c | 2 +- .../test/subsystems/test_radio_control.c | 2 +- sw/airborne/test/test_manual.c | 2 +- sw/simulator/nps/nps_autopilot_fixedwing.c | 2 +- sw/simulator/nps/nps_autopilot_rotorcraft.c | 2 +- .../radio_control/ppm_arch.h | 2 +- .../radio_control/spektrum_arch.h | 2 +- 126 files changed, 205 insertions(+), 205 deletions(-) rename sw/airborne/arch/chibios/{subsystems => modules}/radio_control/ppm_arch.c (94%) rename sw/airborne/arch/chibios/{subsystems => modules}/radio_control/ppm_arch.h (96%) rename sw/airborne/arch/sim/{subsystems => modules}/radio_control/ppm_arch.c (95%) rename sw/airborne/arch/sim/{subsystems => modules}/radio_control/ppm_arch.h (95%) rename sw/airborne/arch/sim/{subsystems => modules}/radio_control/rc_datalink.c (95%) rename sw/airborne/arch/sim/{subsystems => modules}/radio_control/spektrum_arch.c (93%) rename sw/airborne/arch/sim/{subsystems => modules}/radio_control/spektrum_arch.h (95%) rename sw/airborne/arch/stm32/{subsystems => modules}/radio_control/ppm_arch.c (98%) rename sw/airborne/arch/stm32/{subsystems => modules}/radio_control/ppm_arch.h (96%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_common.c (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_common.h (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_compat.c (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_compat.h (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_frsky_common.h (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_frsky_d.h (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_frsky_shared.c (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_frsky_shared.h (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_frsky_x.c (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_frsky_x.h (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_paparazzi.c (97%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_paparazzi.h (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_rx.c (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_rx.h (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_rx_spi.c (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_rx_spi.h (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_rx_spi_common.c (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_rx_spi_common.h (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_settings.c (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_settings.h (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_smartport.c (100%) rename sw/airborne/{subsystems => modules}/radio_control/cc2500_frsky/cc2500_smartport.h (100%) rename sw/airborne/{subsystems => modules}/radio_control/dummy.c (94%) rename sw/airborne/{subsystems => modules}/radio_control/dummy.h (100%) rename sw/airborne/{subsystems => modules}/radio_control/hott.c (94%) rename sw/airborne/{subsystems => modules}/radio_control/hott.h (90%) rename sw/airborne/{subsystems => modules}/radio_control/hott_common.c (97%) rename sw/airborne/{subsystems => modules}/radio_control/hott_common.h (98%) rename sw/airborne/{subsystems => modules}/radio_control/ppm.c (96%) rename sw/airborne/{subsystems => modules}/radio_control/ppm.h (98%) rename sw/airborne/{subsystems => modules/radio_control}/radio_control.c (95%) rename sw/airborne/{subsystems => modules/radio_control}/radio_control.h (100%) rename sw/airborne/{subsystems => modules}/radio_control/rc_datalink.c (95%) rename sw/airborne/{subsystems => modules}/radio_control/rc_datalink.h (97%) rename sw/airborne/{subsystems => modules}/radio_control/sbus.c (95%) rename sw/airborne/{subsystems => modules}/radio_control/sbus.h (90%) rename sw/airborne/{subsystems => modules}/radio_control/sbus_common.c (97%) rename sw/airborne/{subsystems => modules}/radio_control/sbus_common.h (98%) rename sw/airborne/{subsystems => modules}/radio_control/sbus_dual.c (95%) rename sw/airborne/{subsystems => modules}/radio_control/sbus_dual.h (90%) rename sw/airborne/{subsystems => modules}/radio_control/spektrum.c (99%) rename sw/airborne/{subsystems => modules}/radio_control/spektrum.h (98%) rename sw/airborne/{subsystems => modules}/radio_control/spektrum_radio.h (98%) rename sw/airborne/{subsystems => modules}/radio_control/superbitrf_rc.c (95%) rename sw/airborne/{subsystems => modules}/radio_control/superbitrf_rc.h (98%) rename tests/modules/test_arch/{subsystems => modules}/radio_control/ppm_arch.h (96%) rename tests/modules/test_arch/{subsystems => modules}/radio_control/spektrum_arch.h (95%) diff --git a/conf/autopilot/rotorcraft_autopilot.xml b/conf/autopilot/rotorcraft_autopilot.xml index 4e50837a61..a27d0b602a 100644 --- a/conf/autopilot/rotorcraft_autopilot.xml +++ b/conf/autopilot/rotorcraft_autopilot.xml @@ -11,7 +11,7 @@ - + diff --git a/conf/autopilot/rover.xml b/conf/autopilot/rover.xml index a5911cbed2..8769ba68e2 100644 --- a/conf/autopilot/rover.xml +++ b/conf/autopilot/rover.xml @@ -12,7 +12,7 @@ - + diff --git a/conf/autopilot/rover_holonomic.xml b/conf/autopilot/rover_holonomic.xml index 18f6780496..b73668dffd 100644 --- a/conf/autopilot/rover_holonomic.xml +++ b/conf/autopilot/rover_holonomic.xml @@ -12,7 +12,7 @@ - + diff --git a/conf/flight_plans/quadshot_delft.xml b/conf/flight_plans/quadshot_delft.xml index cc947f235e..d23e8e3f24 100644 --- a/conf/flight_plans/quadshot_delft.xml +++ b/conf/flight_plans/quadshot_delft.xml @@ -3,7 +3,7 @@
#include "autopilot.h" - #include "subsystems/radio_control.h" + #include "modules/radio_control/radio_control.h" #include "subsystems/electrical.h" #include "subsystems/actuators.h" #include "firmwares/rotorcraft/guidance/guidance_h.h" diff --git a/conf/flight_plans/tudelft/course_orangeavoid_cyberzoo.xml b/conf/flight_plans/tudelft/course_orangeavoid_cyberzoo.xml index 5110fd89cc..dcad6d5987 100644 --- a/conf/flight_plans/tudelft/course_orangeavoid_cyberzoo.xml +++ b/conf/flight_plans/tudelft/course_orangeavoid_cyberzoo.xml @@ -4,7 +4,7 @@
#include "subsystems/datalink/datalink.h" #include "subsystems/electrical.h" - #include "subsystems/radio_control.h" + #include "modules/radio_control/radio_control.h" #include "subsystems/ahrs.h" #define NPS_GAZEBO_WORLD "cyberzoo_orange_poles.world"
diff --git a/conf/flight_plans/tudelft/course_orangeavoid_cyberzoo_guided.xml b/conf/flight_plans/tudelft/course_orangeavoid_cyberzoo_guided.xml index 9b3cbc8ee3..7eea3c81a8 100644 --- a/conf/flight_plans/tudelft/course_orangeavoid_cyberzoo_guided.xml +++ b/conf/flight_plans/tudelft/course_orangeavoid_cyberzoo_guided.xml @@ -4,7 +4,7 @@
#include "subsystems/datalink/datalink.h" #include "subsystems/electrical.h" - #include "subsystems/radio_control.h" + #include "modules/radio_control/radio_control.h" #include "subsystems/ahrs.h" #define NPS_GAZEBO_WORLD "cyberzoo_orange_poles.world" #include "autopilot.h" diff --git a/conf/flight_plans/tudelft/delft_basic.xml b/conf/flight_plans/tudelft/delft_basic.xml index 54d78620cf..d00b20cb9c 100644 --- a/conf/flight_plans/tudelft/delft_basic.xml +++ b/conf/flight_plans/tudelft/delft_basic.xml @@ -5,7 +5,7 @@ #include "autopilot.h" #include "subsystems/datalink/datalink.h" #include "subsystems/electrical.h" - #include "subsystems/radio_control.h" + #include "modules/radio_control/radio_control.h"
diff --git a/conf/flight_plans/tudelft/delft_bebop.xml b/conf/flight_plans/tudelft/delft_bebop.xml index 4fb6a03207..5f8f7e80b1 100644 --- a/conf/flight_plans/tudelft/delft_bebop.xml +++ b/conf/flight_plans/tudelft/delft_bebop.xml @@ -5,7 +5,7 @@ #include "autopilot.h" #include "subsystems/datalink/datalink.h" #include "subsystems/electrical.h" - #include "subsystems/radio_control.h" + #include "modules/radio_control/radio_control.h"
diff --git a/conf/flight_plans/tudelft/nederdrone_cyberzoo.xml b/conf/flight_plans/tudelft/nederdrone_cyberzoo.xml index 5480b3482d..83d4c88e5b 100644 --- a/conf/flight_plans/tudelft/nederdrone_cyberzoo.xml +++ b/conf/flight_plans/tudelft/nederdrone_cyberzoo.xml @@ -4,7 +4,7 @@
#include "subsystems/datalink/datalink.h" #include "subsystems/electrical.h" - #include "subsystems/radio_control.h" + #include "modules/radio_control/radio_control.h" #include "subsystems/ahrs.h" #include "firmwares/rotorcraft/guidance/guidance_indi_hybrid.h" #include "firmwares/rotorcraft/navigation.h" diff --git a/conf/flight_plans/tudelft/ralphthesis2020_stereo_cyberzoo.xml b/conf/flight_plans/tudelft/ralphthesis2020_stereo_cyberzoo.xml index 750ddab055..2947b51430 100644 --- a/conf/flight_plans/tudelft/ralphthesis2020_stereo_cyberzoo.xml +++ b/conf/flight_plans/tudelft/ralphthesis2020_stereo_cyberzoo.xml @@ -4,7 +4,7 @@
#include "subsystems/datalink/datalink.h" #include "subsystems/electrical.h" - #include "subsystems/radio_control.h" + #include "modules/radio_control/radio_control.h" #include "subsystems/ahrs.h" #define NPS_GAZEBO_WORLD "cyberzoo2019_ralphthesis2020.world" diff --git a/conf/flight_plans/tudelft/rotorcraft_optitrack_path.xml b/conf/flight_plans/tudelft/rotorcraft_optitrack_path.xml index 351be4873f..024e69711d 100644 --- a/conf/flight_plans/tudelft/rotorcraft_optitrack_path.xml +++ b/conf/flight_plans/tudelft/rotorcraft_optitrack_path.xml @@ -4,7 +4,7 @@ max_dist_from_home="8" name="Test flight plan" security_height="0.4">
#include "autopilot.h" - #include "subsystems/radio_control.h" + #include "modules/radio_control/radio_control.h" #include "subsystems/ahrs.h" #include "subsystems/electrical.h" #include "subsystems/datalink/datalink.h" diff --git a/conf/flight_plans/tudelft/train_safe_zoo.xml b/conf/flight_plans/tudelft/train_safe_zoo.xml index d6d6bd4564..a0fb697e4b 100644 --- a/conf/flight_plans/tudelft/train_safe_zoo.xml +++ b/conf/flight_plans/tudelft/train_safe_zoo.xml @@ -4,7 +4,7 @@
#include "subsystems/datalink/datalink.h" #include "subsystems/electrical.h" - #include "subsystems/radio_control.h" + #include "modules/radio_control/radio_control.h" #include "subsystems/ahrs.h"
diff --git a/conf/modules/intermcu_uart.xml b/conf/modules/intermcu_uart.xml index 0943c5f06a..f7501cdd80 100644 --- a/conf/modules/intermcu_uart.xml +++ b/conf/modules/intermcu_uart.xml @@ -68,7 +68,7 @@ - + diff --git a/conf/modules/radio_control_cc2500_frsky.xml b/conf/modules/radio_control_cc2500_frsky.xml index fc4b258b96..a802bb1c75 100644 --- a/conf/modules/radio_control_cc2500_frsky.xml +++ b/conf/modules/radio_control_cc2500_frsky.xml @@ -1,6 +1,6 @@ - + Software implementation of Frsky radio control protocol for onboard CC2500 receiver. @@ -41,12 +41,12 @@
- - + +
- + @@ -56,21 +56,21 @@ - + - - - - - - - - - - + + + + + + + + + + - + diff --git a/conf/modules/radio_control_datalink.xml b/conf/modules/radio_control_datalink.xml index df70de5bb7..62938556eb 100644 --- a/conf/modules/radio_control_datalink.xml +++ b/conf/modules/radio_control_datalink.xml @@ -12,30 +12,30 @@ radio_control
- +
- + - - + + - - + + - + diff --git a/conf/modules/radio_control_hott.xml b/conf/modules/radio_control_hott.xml index c1c0ea0be6..6c6be283e2 100644 --- a/conf/modules/radio_control_hott.xml +++ b/conf/modules/radio_control_hott.xml @@ -13,13 +13,13 @@ radio_control
- +
- + @@ -27,9 +27,9 @@ - - - + + + @@ -37,13 +37,13 @@ - - - + + + - + diff --git a/conf/modules/radio_control_ppm.xml b/conf/modules/radio_control_ppm.xml index c2e0e28b0a..d357948c98 100644 --- a/conf/modules/radio_control_ppm.xml +++ b/conf/modules/radio_control_ppm.xml @@ -17,31 +17,31 @@ radio_control
- +
- + - - - + + + - - - + + + - + diff --git a/conf/modules/radio_control_sbus.xml b/conf/modules/radio_control_sbus.xml index 478fc9ec9a..b012082cb9 100644 --- a/conf/modules/radio_control_sbus.xml +++ b/conf/modules/radio_control_sbus.xml @@ -13,13 +13,13 @@ radio_control
- +
- + @@ -28,9 +28,9 @@ - - - + + + @@ -39,13 +39,13 @@ - - - + + + - + diff --git a/conf/modules/radio_control_sbus_dual.xml b/conf/modules/radio_control_sbus_dual.xml index a157b3745a..9be8253350 100644 --- a/conf/modules/radio_control_sbus_dual.xml +++ b/conf/modules/radio_control_sbus_dual.xml @@ -14,14 +14,14 @@ radio_control
- +
- + @@ -32,9 +32,9 @@ - - - + + + @@ -45,13 +45,13 @@ - - - + + + - + diff --git a/conf/modules/radio_control_spektrum.xml b/conf/modules/radio_control_spektrum.xml index d7c3637a04..77406431c1 100644 --- a/conf/modules/radio_control_spektrum.xml +++ b/conf/modules/radio_control_spektrum.xml @@ -19,7 +19,7 @@ radio_control
- +
@@ -27,7 +27,7 @@ - + @@ -45,11 +45,11 @@ - - + + - + @@ -70,11 +70,11 @@ - - + + - + @@ -87,12 +87,12 @@ - - - + + + - + diff --git a/conf/modules/radio_control_superbitrf_rc.xml b/conf/modules/radio_control_superbitrf_rc.xml index ac586f838f..a18028746b 100644 --- a/conf/modules/radio_control_superbitrf_rc.xml +++ b/conf/modules/radio_control_superbitrf_rc.xml @@ -12,7 +12,7 @@ - + @@ -24,14 +24,14 @@ radio_control
- +
- + @@ -39,8 +39,8 @@ - - + + @@ -50,15 +50,15 @@ - - + + - + diff --git a/sw/airborne/arch/chibios/subsystems/radio_control/ppm_arch.c b/sw/airborne/arch/chibios/modules/radio_control/ppm_arch.c similarity index 94% rename from sw/airborne/arch/chibios/subsystems/radio_control/ppm_arch.c rename to sw/airborne/arch/chibios/modules/radio_control/ppm_arch.c index 77732fcc78..a311a9ce75 100644 --- a/sw/airborne/arch/chibios/subsystems/radio_control/ppm_arch.c +++ b/sw/airborne/arch/chibios/modules/radio_control/ppm_arch.c @@ -24,13 +24,13 @@ * Boston, MA 02111-1307, USA. */ /** - * @file arch/chibios/subsystems/radio_control/ppm_arch.c + * @file arch/chibios/modules/radio_control/ppm_arch.c * PPM interface between ChibiOS and Paparazzi * * Input capture configuration has to be defined in board.h */ -#include "subsystems/radio_control.h" -#include "subsystems/radio_control/ppm.h" +#include "modules/radio_control/radio_control.h" +#include "modules/radio_control/ppm.h" uint8_t ppm_cur_pulse; uint32_t ppm_last_pulse_time; diff --git a/sw/airborne/arch/chibios/subsystems/radio_control/ppm_arch.h b/sw/airborne/arch/chibios/modules/radio_control/ppm_arch.h similarity index 96% rename from sw/airborne/arch/chibios/subsystems/radio_control/ppm_arch.h rename to sw/airborne/arch/chibios/modules/radio_control/ppm_arch.h index e436164338..708d6edf23 100644 --- a/sw/airborne/arch/chibios/subsystems/radio_control/ppm_arch.h +++ b/sw/airborne/arch/chibios/modules/radio_control/ppm_arch.h @@ -24,7 +24,7 @@ * Boston, MA 02111-1307, USA. */ /** - * @file arch/chibios/subsystems/radio_control/ppm_arch.h + * @file arch/chibios/modules/radio_control/ppm_arch.h * PPM interface between ChibiOS and Paparazzi * * Input capture configuration has to be defined in the board.h diff --git a/sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c b/sw/airborne/arch/sim/modules/radio_control/ppm_arch.c similarity index 95% rename from sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c rename to sw/airborne/arch/sim/modules/radio_control/ppm_arch.c index 16fa4b7239..b0eb98ef5d 100644 --- a/sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c +++ b/sw/airborne/arch/sim/modules/radio_control/ppm_arch.c @@ -19,14 +19,14 @@ */ /** - * @file arch/sim/subsystems/radio_control/ppm_arch.c + * @file arch/sim/modules/radio_control/ppm_arch.c * * PPM radio control, simulator specific. * */ -#include "subsystems/radio_control.h" -#include "subsystems/radio_control/ppm.h" +#include "modules/radio_control/radio_control.h" +#include "modules/radio_control/ppm.h" #include diff --git a/sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h b/sw/airborne/arch/sim/modules/radio_control/ppm_arch.h similarity index 95% rename from sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h rename to sw/airborne/arch/sim/modules/radio_control/ppm_arch.h index 90132b0079..8eed3750fe 100644 --- a/sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h +++ b/sw/airborne/arch/sim/modules/radio_control/ppm_arch.h @@ -19,7 +19,7 @@ */ /** - * @file arch/sim/subsystems/radio_control/ppm_arch.h + * @file arch/sim/modules/radio_control/ppm_arch.h * * PPM radio control, simulator specific. * diff --git a/sw/airborne/arch/sim/subsystems/radio_control/rc_datalink.c b/sw/airborne/arch/sim/modules/radio_control/rc_datalink.c similarity index 95% rename from sw/airborne/arch/sim/subsystems/radio_control/rc_datalink.c rename to sw/airborne/arch/sim/modules/radio_control/rc_datalink.c index e0d621ca02..e87ff0833d 100644 --- a/sw/airborne/arch/sim/subsystems/radio_control/rc_datalink.c +++ b/sw/airborne/arch/sim/modules/radio_control/rc_datalink.c @@ -19,7 +19,7 @@ * Boston, MA 02111-1307, USA. */ -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include #include diff --git a/sw/airborne/arch/sim/subsystems/radio_control/spektrum_arch.c b/sw/airborne/arch/sim/modules/radio_control/spektrum_arch.c similarity index 93% rename from sw/airborne/arch/sim/subsystems/radio_control/spektrum_arch.c rename to sw/airborne/arch/sim/modules/radio_control/spektrum_arch.c index 829c7d2e33..f39245f6fb 100644 --- a/sw/airborne/arch/sim/subsystems/radio_control/spektrum_arch.c +++ b/sw/airborne/arch/sim/modules/radio_control/spektrum_arch.c @@ -20,15 +20,15 @@ */ /** - * @file arch/sim/subsystems/radio_control/spektrum_arch.c + * @file arch/sim/modules/radio_control/spektrum_arch.c * * Simulator implementation for spektrum radio control. * */ -#include "subsystems/radio_control.h" -#include "subsystems/radio_control/spektrum_arch.h" -#include "subsystems/radio_control/spektrum.h" +#include "modules/radio_control/radio_control.h" +#include "modules/radio_control/spektrum_arch.h" +#include "modules/radio_control/spektrum.h" #include "std.h" #include diff --git a/sw/airborne/arch/sim/subsystems/radio_control/spektrum_arch.h b/sw/airborne/arch/sim/modules/radio_control/spektrum_arch.h similarity index 95% rename from sw/airborne/arch/sim/subsystems/radio_control/spektrum_arch.h rename to sw/airborne/arch/sim/modules/radio_control/spektrum_arch.h index 41f027f0a2..a85958ce0a 100644 --- a/sw/airborne/arch/sim/subsystems/radio_control/spektrum_arch.h +++ b/sw/airborne/arch/sim/modules/radio_control/spektrum_arch.h @@ -23,7 +23,7 @@ #ifndef RADIO_CONTROL_SPEKTRUM_ARCH_H #define RADIO_CONTROL_SPEKTRUM_ARCH_H -#include "subsystems/radio_control/spektrum_radio.h" +#include "modules/radio_control/spektrum_radio.h" #define RadioControlEventImp spektrum_event diff --git a/sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c b/sw/airborne/arch/stm32/modules/radio_control/ppm_arch.c similarity index 98% rename from sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c rename to sw/airborne/arch/stm32/modules/radio_control/ppm_arch.c index d99e48f7eb..2c2d288461 100644 --- a/sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c +++ b/sw/airborne/arch/stm32/modules/radio_control/ppm_arch.c @@ -19,7 +19,7 @@ */ /** - * @file arch/stm32/subsystems/radio_control/ppm_arch.c + * @file arch/stm32/modules/radio_control/ppm_arch.c * @ingroup stm32_arch * * STM32 ppm decoder. @@ -30,8 +30,8 @@ * */ -#include "subsystems/radio_control.h" -#include "subsystems/radio_control/ppm.h" +#include "modules/radio_control/radio_control.h" +#include "modules/radio_control/ppm.h" #include BOARD_CONFIG diff --git a/sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.h b/sw/airborne/arch/stm32/modules/radio_control/ppm_arch.h similarity index 96% rename from sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.h rename to sw/airborne/arch/stm32/modules/radio_control/ppm_arch.h index c355884fcc..507d2cc124 100644 --- a/sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.h +++ b/sw/airborne/arch/stm32/modules/radio_control/ppm_arch.h @@ -19,7 +19,7 @@ */ /** - * @file arch/stm32/subsystems/radio_control/ppm_arch.h + * @file arch/stm32/modules/radio_control/ppm_arch.h * @ingroup stm32_arch * * STM32 ppm decoder. diff --git a/sw/airborne/autopilot.c b/sw/airborne/autopilot.c index b5b44edcf7..f22ea880f8 100644 --- a/sw/airborne/autopilot.c +++ b/sw/airborne/autopilot.c @@ -36,7 +36,7 @@ #include "mcu_periph/uart.h" #include "mcu_periph/sys_time.h" #include "mcu_periph/gpio.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "modules/core/commands.h" #include "subsystems/actuators.h" //#include "modules/energy/electrical.h" diff --git a/sw/airborne/firmwares/fixedwing/autopilot_generated.c b/sw/airborne/firmwares/fixedwing/autopilot_generated.c index 27bb4d6871..86197eed82 100644 --- a/sw/airborne/firmwares/fixedwing/autopilot_generated.c +++ b/sw/airborne/firmwares/fixedwing/autopilot_generated.c @@ -29,7 +29,7 @@ #include "firmwares/fixedwing/autopilot_generated.h" #include "autopilot.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "modules/core/commands.h" #include "subsystems/actuators.h" #include "modules/core/settings.h" diff --git a/sw/airborne/firmwares/fixedwing/autopilot_rc_helpers.h b/sw/airborne/firmwares/fixedwing/autopilot_rc_helpers.h index 83513be998..b71524e1f9 100644 --- a/sw/airborne/firmwares/fixedwing/autopilot_rc_helpers.h +++ b/sw/airborne/firmwares/fixedwing/autopilot_rc_helpers.h @@ -28,7 +28,7 @@ #define AUTOPILOT_RC_HELPERS_H #include "generated/airframe.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" /** RC mode switch position helper * switch positions threshold are evenly spaced diff --git a/sw/airborne/firmwares/fixedwing/main_fbw.c b/sw/airborne/firmwares/fixedwing/main_fbw.c index bb5e5b0159..993725008e 100644 --- a/sw/airborne/firmwares/fixedwing/main_fbw.c +++ b/sw/airborne/firmwares/fixedwing/main_fbw.c @@ -39,7 +39,7 @@ #include "modules/core/commands.h" #include "subsystems/actuators.h" #include "modules/energy/electrical.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "autopilot.h" #include "paparazzi.h" #include "mcu_periph/i2c.h" diff --git a/sw/airborne/firmwares/rotorcraft/autopilot_firmware.c b/sw/airborne/firmwares/rotorcraft/autopilot_firmware.c index 9285c1b2ea..e1b1194d31 100644 --- a/sw/airborne/firmwares/rotorcraft/autopilot_firmware.c +++ b/sw/airborne/firmwares/rotorcraft/autopilot_firmware.c @@ -34,7 +34,7 @@ //#include "mcu_periph/sys_time.h" #include "modules/energy/electrical.h" #include "subsystems/datalink/telemetry.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #if USE_GPS #include "subsystems/gps.h" diff --git a/sw/airborne/firmwares/rotorcraft/autopilot_generated.c b/sw/airborne/firmwares/rotorcraft/autopilot_generated.c index 930e2a889a..3eb02a440c 100644 --- a/sw/airborne/firmwares/rotorcraft/autopilot_generated.c +++ b/sw/airborne/firmwares/rotorcraft/autopilot_generated.c @@ -30,7 +30,7 @@ #include "autopilot.h" #include "autopilot_arming.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "modules/core/commands.h" #include "subsystems/actuators.h" #include "modules/core/settings.h" diff --git a/sw/airborne/firmwares/rotorcraft/autopilot_rc_helpers.h b/sw/airborne/firmwares/rotorcraft/autopilot_rc_helpers.h index 3f7416026d..95e6571245 100644 --- a/sw/airborne/firmwares/rotorcraft/autopilot_rc_helpers.h +++ b/sw/airborne/firmwares/rotorcraft/autopilot_rc_helpers.h @@ -29,7 +29,7 @@ #define AUTOPILOT_RC_HELPERS_H #include "generated/airframe.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #define AUTOPILOT_THROTTLE_THRESHOLD (MAX_PPRZ / 20) #define AUTOPILOT_YAW_THRESHOLD (MAX_PPRZ * 19 / 20) diff --git a/sw/airborne/firmwares/rotorcraft/autopilot_static.c b/sw/airborne/firmwares/rotorcraft/autopilot_static.c index 06e5aafa0e..4767287d6d 100644 --- a/sw/airborne/firmwares/rotorcraft/autopilot_static.c +++ b/sw/airborne/firmwares/rotorcraft/autopilot_static.c @@ -30,7 +30,7 @@ #include "autopilot.h" #include "autopilot_arming.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "modules/core/commands.h" #include "subsystems/actuators.h" #include "modules/energy/electrical.h" diff --git a/sw/airborne/firmwares/rotorcraft/autopilot_utils.c b/sw/airborne/firmwares/rotorcraft/autopilot_utils.c index f2607c62dd..10a2c57c69 100644 --- a/sw/airborne/firmwares/rotorcraft/autopilot_utils.c +++ b/sw/airborne/firmwares/rotorcraft/autopilot_utils.c @@ -30,7 +30,7 @@ #include "autopilot.h" #include "firmwares/rotorcraft/autopilot_rc_helpers.h" #include "state.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" /** Display descent speed in failsafe mode if needed */ PRINT_CONFIG_VAR(FAILSAFE_DESCENT_SPEED) diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c b/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c index 7334cbb8c2..67650dae87 100644 --- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c +++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c @@ -33,7 +33,7 @@ #include "firmwares/rotorcraft/stabilization.h" #include "firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.h" #include "firmwares/rotorcraft/navigation.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #if GUIDANCE_INDI_HYBRID #include "firmwares/rotorcraft/guidance/guidance_indi_hybrid.h" #else diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_hybrid.c b/sw/airborne/firmwares/rotorcraft/guidance/guidance_hybrid.c index e5718cc698..8bcb09c6fd 100644 --- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_hybrid.c +++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_hybrid.c @@ -34,7 +34,7 @@ #include "firmwares/rotorcraft/guidance/guidance_hybrid.h" #include "firmwares/rotorcraft/guidance/guidance_h.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "firmwares/rotorcraft/stabilization/stabilization_attitude.h" /* for guidance_v_thrust_coeff */ diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_indi.c b/sw/airborne/firmwares/rotorcraft/guidance/guidance_indi.c index ecf1ac4464..d59cdd2d86 100644 --- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_indi.c +++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_indi.c @@ -34,7 +34,7 @@ #include "generated/airframe.h" #include "firmwares/rotorcraft/guidance/guidance_indi.h" #include "subsystems/ins/ins_int.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "state.h" #include "subsystems/imu.h" #include "firmwares/rotorcraft/guidance/guidance_h.h" diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_indi_hybrid.c b/sw/airborne/firmwares/rotorcraft/guidance/guidance_indi_hybrid.c index d95e1781d5..fceb098f14 100644 --- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_indi_hybrid.c +++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_indi_hybrid.c @@ -30,7 +30,7 @@ #include "generated/airframe.h" #include "firmwares/rotorcraft/guidance/guidance_indi_hybrid.h" #include "subsystems/ins/ins_int.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "state.h" #include "subsystems/imu.h" #include "firmwares/rotorcraft/guidance/guidance_h.h" diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c b/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c index e1252101c8..fa48240d44 100644 --- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c +++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c @@ -29,7 +29,7 @@ #include "firmwares/rotorcraft/guidance/guidance_module.h" #include "firmwares/rotorcraft/guidance/guidance_hybrid.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "firmwares/rotorcraft/stabilization.h" #include "firmwares/rotorcraft/navigation.h" diff --git a/sw/airborne/firmwares/rotorcraft/main_ap.c b/sw/airborne/firmwares/rotorcraft/main_ap.c index 025d5991b8..109fd56254 100644 --- a/sw/airborne/firmwares/rotorcraft/main_ap.c +++ b/sw/airborne/firmwares/rotorcraft/main_ap.c @@ -33,7 +33,7 @@ #include #include "led.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "firmwares/rotorcraft/main_ap.h" diff --git a/sw/airborne/firmwares/rotorcraft/main_fbw.c b/sw/airborne/firmwares/rotorcraft/main_fbw.c index ac29662bc8..3cf93037e9 100644 --- a/sw/airborne/firmwares/rotorcraft/main_fbw.c +++ b/sw/airborne/firmwares/rotorcraft/main_fbw.c @@ -38,7 +38,7 @@ #endif #include "modules/energy/electrical.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "subsystems/intermcu/intermcu_fbw.h" #include "firmwares/rotorcraft/main_fbw.h" #include "firmwares/rotorcraft/autopilot_rc_helpers.h" diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c index d34c5a3ba1..59dff4d9ac 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c @@ -26,7 +26,7 @@ #include "firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.h" #include "generated/airframe.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "state.h" #include "firmwares/rotorcraft/stabilization/stabilization_attitude.h" #include "firmwares/rotorcraft/autopilot_rc_helpers.h" diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi.c index 32f8ed0c0f..620943f278 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi.c +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi.c @@ -38,7 +38,7 @@ #include "math/pprz_algebra_float.h" #include "state.h" #include "generated/airframe.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "subsystems/actuators.h" #include "modules/core/abi.h" #include "filters/low_pass_filter.h" diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi_simple.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi_simple.c index e88dbfcea6..ebcd61f30f 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi_simple.c +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi_simple.c @@ -38,7 +38,7 @@ #include "state.h" #include "generated/airframe.h" #include "paparazzi.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "filters/low_pass_filter.h" #if !defined(STABILIZATION_INDI_ACT_DYN_P) && !defined(STABILIZATION_INDI_ACT_DYN_Q) && !defined(STABILIZATION_INDI_ACT_DYN_R) diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.c index b300c0584f..2ebbaeee48 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.c +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.c @@ -29,7 +29,7 @@ #include "firmwares/rotorcraft/stabilization.h" #include "firmwares/rotorcraft/stabilization/stabilization_none.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "generated/airframe.h" struct Int32Rates stabilization_none_rc_cmd; diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c index 682674af88..c958229298 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c @@ -34,7 +34,7 @@ #include "state.h" #include "subsystems/imu.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "firmwares/rotorcraft/autopilot_rc_helpers.h" #define MAX_SUM_ERR 40000 diff --git a/sw/airborne/firmwares/rover/autopilot_firmware.c b/sw/airborne/firmwares/rover/autopilot_firmware.c index c6c635de11..191a7040c5 100644 --- a/sw/airborne/firmwares/rover/autopilot_firmware.c +++ b/sw/airborne/firmwares/rover/autopilot_firmware.c @@ -32,7 +32,7 @@ #include #include "modules/energy/electrical.h" #include "subsystems/datalink/telemetry.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #if USE_GPS #include "subsystems/gps.h" diff --git a/sw/airborne/firmwares/rover/autopilot_generated.c b/sw/airborne/firmwares/rover/autopilot_generated.c index 98aab4de31..1082229ec5 100644 --- a/sw/airborne/firmwares/rover/autopilot_generated.c +++ b/sw/airborne/firmwares/rover/autopilot_generated.c @@ -29,7 +29,7 @@ #include "firmwares/rotorcraft/autopilot_generated.h" #include "autopilot.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "modules/core/commands.h" #include "subsystems/actuators.h" #include "modules/core/settings.h" diff --git a/sw/airborne/firmwares/rover/autopilot_rc_helpers.h b/sw/airborne/firmwares/rover/autopilot_rc_helpers.h index 3f7416026d..95e6571245 100644 --- a/sw/airborne/firmwares/rover/autopilot_rc_helpers.h +++ b/sw/airborne/firmwares/rover/autopilot_rc_helpers.h @@ -29,7 +29,7 @@ #define AUTOPILOT_RC_HELPERS_H #include "generated/airframe.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #define AUTOPILOT_THROTTLE_THRESHOLD (MAX_PPRZ / 20) #define AUTOPILOT_YAW_THRESHOLD (MAX_PPRZ * 19 / 20) diff --git a/sw/airborne/firmwares/rover/autopilot_utils.c b/sw/airborne/firmwares/rover/autopilot_utils.c index 677e0f56f4..c20554171a 100644 --- a/sw/airborne/firmwares/rover/autopilot_utils.c +++ b/sw/airborne/firmwares/rover/autopilot_utils.c @@ -29,7 +29,7 @@ #include "autopilot.h" #include "firmwares/rotorcraft/autopilot_rc_helpers.h" #include "state.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" /** Display descent speed in failsafe mode if needed */ PRINT_CONFIG_VAR(FAILSAFE_DESCENT_SPEED) diff --git a/sw/airborne/firmwares/rover/main_ap.c b/sw/airborne/firmwares/rover/main_ap.c index 19505b8256..ea47e50b83 100644 --- a/sw/airborne/firmwares/rover/main_ap.c +++ b/sw/airborne/firmwares/rover/main_ap.c @@ -32,7 +32,7 @@ #include #include "led.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "firmwares/rover/main_ap.h" diff --git a/sw/airborne/inter_mcu.h b/sw/airborne/inter_mcu.h index 434011ca89..6d4d115f72 100644 --- a/sw/airborne/inter_mcu.h +++ b/sw/airborne/inter_mcu.h @@ -42,7 +42,7 @@ #include "paparazzi.h" #include "pprz_mutex.h" #include "generated/airframe.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "modules/energy/electrical.h" #include "firmwares/fixedwing/main_fbw.h" diff --git a/sw/airborne/mcu.c b/sw/airborne/mcu.c index 063ff87c80..b2671b42dd 100644 --- a/sw/airborne/mcu.c +++ b/sw/airborne/mcu.c @@ -36,7 +36,7 @@ #endif #if defined RADIO_CONTROL #if defined RADIO_CONTROL_BIND_IMPL_FUNC & defined SPEKTRUM_BIND_PIN_PORT -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #endif #endif #if USE_UART0 || USE_UART1 || USE_UART2 || USE_UART3 || USE_UART4 || USE_UART5 || USE_UART6 || USE_UART7 || USE_UART8 diff --git a/sw/airborne/modules/ctrl/ctrl_effectiveness_scheduling.c b/sw/airborne/modules/ctrl/ctrl_effectiveness_scheduling.c index 084aa69d72..df4bbddbb4 100644 --- a/sw/airborne/modules/ctrl/ctrl_effectiveness_scheduling.c +++ b/sw/airborne/modules/ctrl/ctrl_effectiveness_scheduling.c @@ -28,7 +28,7 @@ #include "firmwares/rotorcraft/guidance/guidance_h.h" #include "generated/airframe.h" #include "state.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #if STABILIZATION_INDI_ALLOCATION_PSEUDO_INVERSE #error "You need to use WLS control allocation for this module" diff --git a/sw/airborne/modules/ctrl/ctrl_module_innerloop_demo.c b/sw/airborne/modules/ctrl/ctrl_module_innerloop_demo.c index 640a708687..fe4f59898f 100644 --- a/sw/airborne/modules/ctrl/ctrl_module_innerloop_demo.c +++ b/sw/airborne/modules/ctrl/ctrl_module_innerloop_demo.c @@ -26,7 +26,7 @@ #include "modules/ctrl/ctrl_module_innerloop_demo.h" #include "state.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "firmwares/rotorcraft/stabilization.h" struct ctrl_module_demo_struct { diff --git a/sw/airborne/modules/ctrl/ctrl_module_outerloop_demo.c b/sw/airborne/modules/ctrl/ctrl_module_outerloop_demo.c index 08b2b5df12..6a35ed6948 100644 --- a/sw/airborne/modules/ctrl/ctrl_module_outerloop_demo.c +++ b/sw/airborne/modules/ctrl/ctrl_module_outerloop_demo.c @@ -26,7 +26,7 @@ #include "modules/ctrl/ctrl_module_outerloop_demo.h" #include "state.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "firmwares/rotorcraft/stabilization.h" #include "firmwares/rotorcraft/stabilization/stabilization_attitude.h" #include "firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.h" diff --git a/sw/airborne/modules/ctrl/ctrl_windtunnel.c b/sw/airborne/modules/ctrl/ctrl_windtunnel.c index b9f4672b14..5d09c00cb3 100644 --- a/sw/airborne/modules/ctrl/ctrl_windtunnel.c +++ b/sw/airborne/modules/ctrl/ctrl_windtunnel.c @@ -26,7 +26,7 @@ #include "modules/ctrl/ctrl_windtunnel.h" #include "state.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "firmwares/rotorcraft/stabilization.h" #include "modules/energy/electrical.h" diff --git a/sw/airborne/modules/ctrl/gain_scheduling.c b/sw/airborne/modules/ctrl/gain_scheduling.c index 41a927b6a2..22d4121dbb 100644 --- a/sw/airborne/modules/ctrl/gain_scheduling.c +++ b/sw/airborne/modules/ctrl/gain_scheduling.c @@ -27,7 +27,7 @@ // #include "state.h" #include "math/pprz_algebra_int.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #ifndef NUMBER_OF_GAINSETS #error You must define the number of gainsets to use this module! diff --git a/sw/airborne/modules/datalink/mavlink.c b/sw/airborne/modules/datalink/mavlink.c index e5ab99bba7..2e95802f0a 100644 --- a/sw/airborne/modules/datalink/mavlink.c +++ b/sw/airborne/modules/datalink/mavlink.c @@ -53,7 +53,7 @@ #include "autopilot_guided.h" #if defined RADIO_CONTROL -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #endif #include "modules/datalink/missionlib/mission_manager.h" @@ -728,7 +728,7 @@ static void mavlink_send_gps_status(struct transport_tx *trans, struct link_devi } #if defined RADIO_CONTROL -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" // since they really want PPM values, use a hack to check if are using ppm subsystem #ifdef PPM_PULSE_TYPE_POSITIVE #define RC_CHANNELS RADIO_CTL_NB diff --git a/sw/airborne/modules/decawave/decawave_anchorless_communication.c b/sw/airborne/modules/decawave/decawave_anchorless_communication.c index 942214c62a..45138803cf 100644 --- a/sw/airborne/modules/decawave/decawave_anchorless_communication.c +++ b/sw/airborne/modules/decawave/decawave_anchorless_communication.c @@ -39,7 +39,7 @@ #include "decawave_anchorless_communication.h" #include "subsystems/datalink/telemetry.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "state.h" #include "mcu_periph/uart.h" #include "modules/core/abi.h" diff --git a/sw/airborne/modules/glide_wing_lock/glide_wing_lock.c b/sw/airborne/modules/glide_wing_lock/glide_wing_lock.c index befea125db..f8767b5689 100644 --- a/sw/airborne/modules/glide_wing_lock/glide_wing_lock.c +++ b/sw/airborne/modules/glide_wing_lock/glide_wing_lock.c @@ -31,7 +31,7 @@ #include "mcu_periph/adc.h" #include "modules/core/commands.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "autopilot.h" struct adc_buf adcbuf; diff --git a/sw/airborne/modules/helicopter/throttle_curve.c b/sw/airborne/modules/helicopter/throttle_curve.c index 77156211e2..1bdfe14e8d 100644 --- a/sw/airborne/modules/helicopter/throttle_curve.c +++ b/sw/airborne/modules/helicopter/throttle_curve.c @@ -27,7 +27,7 @@ #include "throttle_curve.h" #include "modules/core/commands.h" #include "autopilot.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "modules/core/abi.h" /* The switching values for the Throttle Curve Mode switch */ diff --git a/sw/airborne/modules/light/led_safety_status.c b/sw/airborne/modules/light/led_safety_status.c index 9869e0c62e..0173d3fc19 100644 --- a/sw/airborne/modules/light/led_safety_status.c +++ b/sw/airborne/modules/light/led_safety_status.c @@ -29,7 +29,7 @@ #include "led.h" #include "generated/airframe.h" #include "modules/energy/electrical.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "autopilot.h" #include "autopilot_rc_helpers.h" diff --git a/sw/airborne/modules/px4_gimbal/px4_gimbal.c b/sw/airborne/modules/px4_gimbal/px4_gimbal.c index dc08850c85..2149d6ee28 100644 --- a/sw/airborne/modules/px4_gimbal/px4_gimbal.c +++ b/sw/airborne/modules/px4_gimbal/px4_gimbal.c @@ -11,7 +11,7 @@ */ #include "modules/px4_gimbal/px4_gimbal.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "generated/airframe.h" // AC_ID is required #include "subsystems/actuators.h" diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_common.c b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_common.c similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_common.c rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_common.c diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_common.h b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_common.h similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_common.h rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_common.h diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_compat.c b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_compat.c similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_compat.c rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_compat.c diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_compat.h b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_compat.h similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_compat.h rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_compat.h diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_frsky_common.h b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_frsky_common.h similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_frsky_common.h rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_frsky_common.h diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_frsky_d.h b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_frsky_d.h similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_frsky_d.h rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_frsky_d.h diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_frsky_shared.c b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_frsky_shared.c similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_frsky_shared.c rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_frsky_shared.c diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_frsky_shared.h b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_frsky_shared.h similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_frsky_shared.h rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_frsky_shared.h diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_frsky_x.c b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_frsky_x.c similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_frsky_x.c rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_frsky_x.c diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_frsky_x.h b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_frsky_x.h similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_frsky_x.h rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_frsky_x.h diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_paparazzi.c b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_paparazzi.c similarity index 97% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_paparazzi.c rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_paparazzi.c index 0973c041f6..2c86ad0173 100644 --- a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_paparazzi.c +++ b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_paparazzi.c @@ -21,7 +21,7 @@ #include "cc2500_paparazzi.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "peripherals/cc2500.h" #include "cc2500_common.h" #include "cc2500_frsky_common.h" diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_paparazzi.h b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_paparazzi.h similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_paparazzi.h rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_paparazzi.h diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_rx.c b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_rx.c similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_rx.c rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_rx.c diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_rx.h b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_rx.h similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_rx.h rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_rx.h diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_rx_spi.c b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_rx_spi.c similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_rx_spi.c rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_rx_spi.c diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_rx_spi.h b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_rx_spi.h similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_rx_spi.h rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_rx_spi.h diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_rx_spi_common.c b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_rx_spi_common.c similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_rx_spi_common.c rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_rx_spi_common.c diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_rx_spi_common.h b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_rx_spi_common.h similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_rx_spi_common.h rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_rx_spi_common.h diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_settings.c b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_settings.c similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_settings.c rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_settings.c diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_settings.h b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_settings.h similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_settings.h rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_settings.h diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_smartport.c b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_smartport.c similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_smartport.c rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_smartport.c diff --git a/sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_smartport.h b/sw/airborne/modules/radio_control/cc2500_frsky/cc2500_smartport.h similarity index 100% rename from sw/airborne/subsystems/radio_control/cc2500_frsky/cc2500_smartport.h rename to sw/airborne/modules/radio_control/cc2500_frsky/cc2500_smartport.h diff --git a/sw/airborne/subsystems/radio_control/dummy.c b/sw/airborne/modules/radio_control/dummy.c similarity index 94% rename from sw/airborne/subsystems/radio_control/dummy.c rename to sw/airborne/modules/radio_control/dummy.c index 7b41309819..efe582ada9 100644 --- a/sw/airborne/subsystems/radio_control/dummy.c +++ b/sw/airborne/modules/radio_control/dummy.c @@ -19,6 +19,6 @@ * Boston, MA 02111-1307, USA. */ -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" void radio_control_impl_init(void) { } diff --git a/sw/airborne/subsystems/radio_control/dummy.h b/sw/airborne/modules/radio_control/dummy.h similarity index 100% rename from sw/airborne/subsystems/radio_control/dummy.h rename to sw/airborne/modules/radio_control/dummy.h diff --git a/sw/airborne/subsystems/radio_control/hott.c b/sw/airborne/modules/radio_control/hott.c similarity index 94% rename from sw/airborne/subsystems/radio_control/hott.c rename to sw/airborne/modules/radio_control/hott.c index 5f9d459d2a..69eb8b6698 100644 --- a/sw/airborne/subsystems/radio_control/hott.c +++ b/sw/airborne/modules/radio_control/hott.c @@ -19,13 +19,13 @@ * Boston, MA 02111-1307, USA. */ -/** @file subsystems/radio_control/hott.c +/** @file modules/radio_control/hott.c * * Single HOTT radio_control SUMD */ -#include "subsystems/radio_control.h" -#include "subsystems/radio_control/hott.h" +#include "modules/radio_control/radio_control.h" +#include "modules/radio_control/hott.h" #include BOARD_CONFIG diff --git a/sw/airborne/subsystems/radio_control/hott.h b/sw/airborne/modules/radio_control/hott.h similarity index 90% rename from sw/airborne/subsystems/radio_control/hott.h rename to sw/airborne/modules/radio_control/hott.h index 7ce24b02c2..5208687b30 100644 --- a/sw/airborne/subsystems/radio_control/hott.h +++ b/sw/airborne/modules/radio_control/hott.h @@ -19,7 +19,7 @@ */ /** - * @file subsystems/radio_control/hott.h + * @file modules/radio_control/hott.h * * Radio control via single HOTT receiver in SUMD mode. */ @@ -27,7 +27,7 @@ #ifndef RC_HOTT_H #define RC_HOTT_H -#include "subsystems/radio_control/hott_common.h" +#include "modules/radio_control/hott_common.h" extern struct SHott hott; diff --git a/sw/airborne/subsystems/radio_control/hott_common.c b/sw/airborne/modules/radio_control/hott_common.c similarity index 97% rename from sw/airborne/subsystems/radio_control/hott_common.c rename to sw/airborne/modules/radio_control/hott_common.c index 45142f6c89..f407969b6f 100644 --- a/sw/airborne/subsystems/radio_control/hott_common.c +++ b/sw/airborne/modules/radio_control/hott_common.c @@ -18,13 +18,13 @@ * . */ -/** @file subsystems/radio_control/hott_common.c +/** @file modules/radio_control/hott_common.c * * Graupner HOTT SUMD decoder */ -#include "subsystems/radio_control.h" -#include "subsystems/radio_control/hott_common.h" +#include "modules/radio_control/radio_control.h" +#include "modules/radio_control/hott_common.h" #include BOARD_CONFIG #include diff --git a/sw/airborne/subsystems/radio_control/hott_common.h b/sw/airborne/modules/radio_control/hott_common.h similarity index 98% rename from sw/airborne/subsystems/radio_control/hott_common.h rename to sw/airborne/modules/radio_control/hott_common.h index eba326877a..9d11ac8f3c 100644 --- a/sw/airborne/subsystems/radio_control/hott_common.h +++ b/sw/airborne/modules/radio_control/hott_common.h @@ -19,7 +19,7 @@ */ /** - * @file subsystems/radio_control/hott_common.h + * @file modules/radio_control/radio_control.hott_common.h * * Common hott structs and defines. */ diff --git a/sw/airborne/subsystems/radio_control/ppm.c b/sw/airborne/modules/radio_control/ppm.c similarity index 96% rename from sw/airborne/subsystems/radio_control/ppm.c rename to sw/airborne/modules/radio_control/ppm.c index fb6c12f026..e981a2a849 100644 --- a/sw/airborne/subsystems/radio_control/ppm.c +++ b/sw/airborne/modules/radio_control/ppm.c @@ -19,14 +19,14 @@ */ /** - * @file subsystems/radio_control/ppm.c + * @file modules/radio_control/ppm.c * * Architecture independent functions for PPM radio control. * */ -#include "subsystems/radio_control.h" -#include "subsystems/radio_control/ppm.h" +#include "modules/radio_control/radio_control.h" +#include "modules/radio_control/ppm.h" uint16_t ppm_pulses[RADIO_CTL_NB]; volatile bool ppm_frame_available; diff --git a/sw/airborne/subsystems/radio_control/ppm.h b/sw/airborne/modules/radio_control/ppm.h similarity index 98% rename from sw/airborne/subsystems/radio_control/ppm.h rename to sw/airborne/modules/radio_control/ppm.h index a8300e9fc2..071f142d53 100644 --- a/sw/airborne/subsystems/radio_control/ppm.h +++ b/sw/airborne/modules/radio_control/ppm.h @@ -30,7 +30,7 @@ /** * Architecture dependant code */ -#include "subsystems/radio_control/ppm_arch.h" +#include "modules/radio_control/ppm_arch.h" /* must be implemented by arch dependant code */ extern void ppm_arch_init(void); diff --git a/sw/airborne/subsystems/radio_control.c b/sw/airborne/modules/radio_control/radio_control.c similarity index 95% rename from sw/airborne/subsystems/radio_control.c rename to sw/airborne/modules/radio_control/radio_control.c index dbbb4b3fdb..43a3889cd4 100644 --- a/sw/airborne/subsystems/radio_control.c +++ b/sw/airborne/modules/radio_control/radio_control.c @@ -19,13 +19,13 @@ */ /** - * @file subsystems/radio_control.c + * @file modules/radio_control.c * * Implementation independant radio control handing. * */ -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" struct RadioControl radio_control; diff --git a/sw/airborne/subsystems/radio_control.h b/sw/airborne/modules/radio_control/radio_control.h similarity index 100% rename from sw/airborne/subsystems/radio_control.h rename to sw/airborne/modules/radio_control/radio_control.h diff --git a/sw/airborne/subsystems/radio_control/rc_datalink.c b/sw/airborne/modules/radio_control/rc_datalink.c similarity index 95% rename from sw/airborne/subsystems/radio_control/rc_datalink.c rename to sw/airborne/modules/radio_control/rc_datalink.c index dbef64e21a..d3cc64ed09 100644 --- a/sw/airborne/subsystems/radio_control/rc_datalink.c +++ b/sw/airborne/modules/radio_control/rc_datalink.c @@ -19,13 +19,13 @@ */ /** - * @file subsystems/radio_control/rc_datalink.c + * @file modules/radio_control/rc_datalink.c * * Radio control input via datalink. */ -#include "subsystems/radio_control/rc_datalink.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/rc_datalink.h" +#include "modules/radio_control/radio_control.h" int8_t rc_dl_values[ RC_DL_NB_CHANNEL ]; volatile bool rc_dl_frame_available; diff --git a/sw/airborne/subsystems/radio_control/rc_datalink.h b/sw/airborne/modules/radio_control/rc_datalink.h similarity index 97% rename from sw/airborne/subsystems/radio_control/rc_datalink.h rename to sw/airborne/modules/radio_control/rc_datalink.h index 25acc0dbfc..6bbb8a567a 100644 --- a/sw/airborne/subsystems/radio_control/rc_datalink.h +++ b/sw/airborne/modules/radio_control/rc_datalink.h @@ -19,7 +19,7 @@ */ /** - * @file subsystems/radio_control/rc_datalink.h + * @file modules/radio_control/rc_datalink.h * * Radio control input via datalink. */ diff --git a/sw/airborne/subsystems/radio_control/sbus.c b/sw/airborne/modules/radio_control/sbus.c similarity index 95% rename from sw/airborne/subsystems/radio_control/sbus.c rename to sw/airborne/modules/radio_control/sbus.c index 945270cdd3..0fedc98973 100644 --- a/sw/airborne/subsystems/radio_control/sbus.c +++ b/sw/airborne/modules/radio_control/sbus.c @@ -19,13 +19,13 @@ * Boston, MA 02111-1307, USA. */ -/** @file subsystems/radio_control/sbus.c +/** @file modules/radio_control/sbus.c * * Single SBUS radio_control */ -#include "subsystems/radio_control.h" -#include "subsystems/radio_control/sbus.h" +#include "modules/radio_control/radio_control.h" +#include "modules/radio_control/sbus.h" #include BOARD_CONFIG #ifndef RC_POLARITY_GPIO_PORT diff --git a/sw/airborne/subsystems/radio_control/sbus.h b/sw/airborne/modules/radio_control/sbus.h similarity index 90% rename from sw/airborne/subsystems/radio_control/sbus.h rename to sw/airborne/modules/radio_control/sbus.h index abd59cfbac..9698414d8e 100644 --- a/sw/airborne/subsystems/radio_control/sbus.h +++ b/sw/airborne/modules/radio_control/sbus.h @@ -19,7 +19,7 @@ */ /** - * @file subsystems/radio_control/sbus.h + * @file modules/radio_control/sbus.h * * Radio control via single SBUS receiver. */ @@ -27,7 +27,7 @@ #ifndef RC_SBUS_H #define RC_SBUS_H -#include "subsystems/radio_control/sbus_common.h" +#include "modules/radio_control/sbus_common.h" extern struct Sbus sbus; diff --git a/sw/airborne/subsystems/radio_control/sbus_common.c b/sw/airborne/modules/radio_control/sbus_common.c similarity index 97% rename from sw/airborne/subsystems/radio_control/sbus_common.c rename to sw/airborne/modules/radio_control/sbus_common.c index 8277ef0637..f61996d888 100644 --- a/sw/airborne/subsystems/radio_control/sbus_common.c +++ b/sw/airborne/modules/radio_control/sbus_common.c @@ -18,13 +18,13 @@ * . */ -/** @file subsystems/radio_control/sbus_common.c +/** @file modules/radio_control/sbus_common.c * * Futaba SBUS decoder */ -#include "subsystems/radio_control.h" -#include "subsystems/radio_control/sbus_common.h" +#include "modules/radio_control/radio_control.h" +#include "modules/radio_control/sbus_common.h" #include "mcu_periph/sys_time.h" #include BOARD_CONFIG #include diff --git a/sw/airborne/subsystems/radio_control/sbus_common.h b/sw/airborne/modules/radio_control/sbus_common.h similarity index 98% rename from sw/airborne/subsystems/radio_control/sbus_common.h rename to sw/airborne/modules/radio_control/sbus_common.h index 1a4b848c7c..4793a00135 100644 --- a/sw/airborne/subsystems/radio_control/sbus_common.h +++ b/sw/airborne/modules/radio_control/sbus_common.h @@ -19,7 +19,7 @@ */ /** - * @file subsystems/radio_control/sbus_common.h + * @file modules/radio_control/sbus_common.h * * Common sbus structs and defines. */ diff --git a/sw/airborne/subsystems/radio_control/sbus_dual.c b/sw/airborne/modules/radio_control/sbus_dual.c similarity index 95% rename from sw/airborne/subsystems/radio_control/sbus_dual.c rename to sw/airborne/modules/radio_control/sbus_dual.c index c7e4c43334..f5141fa778 100644 --- a/sw/airborne/subsystems/radio_control/sbus_dual.c +++ b/sw/airborne/modules/radio_control/sbus_dual.c @@ -19,13 +19,13 @@ */ /** - * @file subsystems/radio_control/sbus_dual.c + * @file modules/radio_control/sbus_dual.c * * Dual SBUS radio_control */ -#include "subsystems/radio_control.h" -#include "subsystems/radio_control/sbus_dual.h" +#include "modules/radio_control/radio_control.h" +#include "modules/radio_control/sbus_dual.h" #include BOARD_CONFIG #include "mcu_periph/uart.h" #include diff --git a/sw/airborne/subsystems/radio_control/sbus_dual.h b/sw/airborne/modules/radio_control/sbus_dual.h similarity index 90% rename from sw/airborne/subsystems/radio_control/sbus_dual.h rename to sw/airborne/modules/radio_control/sbus_dual.h index efbd71a00c..759fd03017 100644 --- a/sw/airborne/subsystems/radio_control/sbus_dual.h +++ b/sw/airborne/modules/radio_control/sbus_dual.h @@ -19,7 +19,7 @@ */ /** - * @file subsystems/radio_control/sbus_dual.h + * @file modules/radio_control/sbus_dual.h * * Radio control via two SBUS receivers. */ @@ -27,7 +27,7 @@ #ifndef RC_SBUS_DUAL_H #define RC_SBUS_DUAL_H -#include "subsystems/radio_control/sbus_common.h" +#include "modules/radio_control/sbus_common.h" extern struct Sbus sbus1, sbus2; diff --git a/sw/airborne/subsystems/radio_control/spektrum.c b/sw/airborne/modules/radio_control/spektrum.c similarity index 99% rename from sw/airborne/subsystems/radio_control/spektrum.c rename to sw/airborne/modules/radio_control/spektrum.c index d58db5dd55..965e95bcc2 100644 --- a/sw/airborne/subsystems/radio_control/spektrum.c +++ b/sw/airborne/modules/radio_control/spektrum.c @@ -21,17 +21,17 @@ * . */ -#include "subsystems/radio_control/spektrum.h" +#include "modules/radio_control/spektrum.h" /** - * @file subsystems/radio_control/spektrum.c + * @file modules/radio_control/spektrum.c * * Spektrum sattelite receiver implementation. For the protocol specification see: * http://www.spektrumrc.com/ProdInfo/Files/Remote%20Receiver%20Interfacing%20Rev%20A.pdf */ #include "std.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "mcu_periph/uart.h" #include "mcu_periph/gpio.h" #include "mcu_periph/sys_time.h" diff --git a/sw/airborne/subsystems/radio_control/spektrum.h b/sw/airborne/modules/radio_control/spektrum.h similarity index 98% rename from sw/airborne/subsystems/radio_control/spektrum.h rename to sw/airborne/modules/radio_control/spektrum.h index 70a592690a..3d4a5d7570 100644 --- a/sw/airborne/subsystems/radio_control/spektrum.h +++ b/sw/airborne/modules/radio_control/spektrum.h @@ -21,7 +21,7 @@ */ /** - * @file subsystems/radio_control/spektrum.h + * @file modules/radio_control/spektrum.h * * Radio control spektrum interface. */ diff --git a/sw/airborne/subsystems/radio_control/spektrum_radio.h b/sw/airborne/modules/radio_control/spektrum_radio.h similarity index 98% rename from sw/airborne/subsystems/radio_control/spektrum_radio.h rename to sw/airborne/modules/radio_control/spektrum_radio.h index 50dac64118..ebef0c23fb 100644 --- a/sw/airborne/subsystems/radio_control/spektrum_radio.h +++ b/sw/airborne/modules/radio_control/spektrum_radio.h @@ -20,7 +20,7 @@ */ /** - * @file subsystems/radio_control/spektrum_radio.h + * @file modules/radio_control/spektrum_radio.h * * Radio control channels defaults, because they are digital */ diff --git a/sw/airborne/subsystems/radio_control/superbitrf_rc.c b/sw/airborne/modules/radio_control/superbitrf_rc.c similarity index 95% rename from sw/airborne/subsystems/radio_control/superbitrf_rc.c rename to sw/airborne/modules/radio_control/superbitrf_rc.c index bd1b77aabf..c24ebced8e 100644 --- a/sw/airborne/subsystems/radio_control/superbitrf_rc.c +++ b/sw/airborne/modules/radio_control/superbitrf_rc.c @@ -19,12 +19,12 @@ */ /** - * @file subsystems/radio_control/superbitrf_rc.c + * @file modules/radio_control/superbitrf_rc.c * DSM2 and DSMX radio control implementation for the cyrf6936 2.4GHz radio chip trough SPI */ #include "superbitrf_rc.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" /** * Initialization diff --git a/sw/airborne/subsystems/radio_control/superbitrf_rc.h b/sw/airborne/modules/radio_control/superbitrf_rc.h similarity index 98% rename from sw/airborne/subsystems/radio_control/superbitrf_rc.h rename to sw/airborne/modules/radio_control/superbitrf_rc.h index 448a7cd24c..f47ccdda83 100644 --- a/sw/airborne/subsystems/radio_control/superbitrf_rc.h +++ b/sw/airborne/modules/radio_control/superbitrf_rc.h @@ -19,7 +19,7 @@ */ /** - * @file subsystems/radio_control/superbitrf_rc.h + * @file modules/radio_control/superbitrf_rc.h * DSM2 and DSMX radio control implementation for the cyrf6936 2.4GHz radio chip trough SPI */ 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 1ec91e56f7..2fa45cd2e0 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 @@ -28,7 +28,7 @@ #include "led.h" #include "mcu.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "mcu_periph/sys_time_arch.h" #include "mcu_periph/uart.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 51c29aa8cd..921a4cb27d 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 @@ -26,7 +26,7 @@ #include "modules/spektrum_soft_bind/spektrum_soft_bind_fbw.h" #include "subsystems/intermcu/intermcu_fbw.h" #include "mcu.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "mcu_periph/sys_time_arch.h" #include "mcu_periph/gpio.h" diff --git a/sw/airborne/peripherals/cyrf6936.c b/sw/airborne/peripherals/cyrf6936.c index 33e73f3e60..7f2a38826f 100644 --- a/sw/airborne/peripherals/cyrf6936.c +++ b/sw/airborne/peripherals/cyrf6936.c @@ -28,7 +28,7 @@ #include "mcu_periph/spi.h" #include "mcu_periph/gpio.h" #include "mcu_periph/sys_time.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "mcu_periph/uart.h" #include "pprzlink/messages.h" diff --git a/sw/airborne/subsystems/datalink/datalink.c b/sw/airborne/subsystems/datalink/datalink.c index 2638085cd0..0bdb81de56 100644 --- a/sw/airborne/subsystems/datalink/datalink.c +++ b/sw/airborne/subsystems/datalink/datalink.c @@ -37,7 +37,7 @@ #include "pprzlink/messages.h" #if defined RADIO_CONTROL && defined RADIO_CONTROL_TYPE_DATALINK -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #endif #if USE_GPS diff --git a/sw/airborne/subsystems/intermcu/intermcu_ap.c b/sw/airborne/subsystems/intermcu/intermcu_ap.c index d89745ddba..b7e15532bf 100644 --- a/sw/airborne/subsystems/intermcu/intermcu_ap.c +++ b/sw/airborne/subsystems/intermcu/intermcu_ap.c @@ -26,7 +26,7 @@ #include "intermcu_ap.h" #include "pprzlink/intermcu_msg.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "mcu_periph/uart.h" #include "modules/energy/electrical.h" diff --git a/sw/airborne/subsystems/intermcu/intermcu_fbw.c b/sw/airborne/subsystems/intermcu/intermcu_fbw.c index 5f623c3cfd..ebba7eeeff 100644 --- a/sw/airborne/subsystems/intermcu/intermcu_fbw.c +++ b/sw/airborne/subsystems/intermcu/intermcu_fbw.c @@ -28,7 +28,7 @@ #include "intermcu_fbw.h" #include "pprzlink/intermcu_msg.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "modules/energy/electrical.h" #include "mcu_periph/uart.h" #include "modules/telemetry/telemetry_intermcu.h" diff --git a/sw/airborne/test/subsystems/test_radio_control.c b/sw/airborne/test/subsystems/test_radio_control.c index bec80d3c54..a26eb37ebd 100644 --- a/sw/airborne/test/subsystems/test_radio_control.c +++ b/sw/airborne/test/subsystems/test_radio_control.c @@ -26,7 +26,7 @@ #define DATALINK_C #include "subsystems/datalink/downlink.h" #include "modules/datalink/pprz_dl.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" static inline void main_init(void); static inline void main_periodic_task(void); diff --git a/sw/airborne/test/test_manual.c b/sw/airborne/test/test_manual.c index 2c8b4342ac..25c2967b6d 100644 --- a/sw/airborne/test/test_manual.c +++ b/sw/airborne/test/test_manual.c @@ -44,7 +44,7 @@ #include "subsystems/actuators/motor_mixing.h" #endif -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" static inline void main_init(void); static inline void main_periodic(void); diff --git a/sw/simulator/nps/nps_autopilot_fixedwing.c b/sw/simulator/nps/nps_autopilot_fixedwing.c index c6b6fdf010..4148279aa0 100644 --- a/sw/simulator/nps/nps_autopilot_fixedwing.c +++ b/sw/simulator/nps/nps_autopilot_fixedwing.c @@ -41,7 +41,7 @@ #include "nps_electrical.h" #include "nps_fdm.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "subsystems/imu.h" #include "mcu_periph/sys_time.h" #include "state.h" diff --git a/sw/simulator/nps/nps_autopilot_rotorcraft.c b/sw/simulator/nps/nps_autopilot_rotorcraft.c index 1b4fd5b92a..17a866128d 100644 --- a/sw/simulator/nps/nps_autopilot_rotorcraft.c +++ b/sw/simulator/nps/nps_autopilot_rotorcraft.c @@ -27,7 +27,7 @@ #include "nps_electrical.h" #include "nps_fdm.h" -#include "subsystems/radio_control.h" +#include "modules/radio_control/radio_control.h" #include "subsystems/imu.h" #include "mcu_periph/sys_time.h" #include "state.h" diff --git a/tests/modules/test_arch/subsystems/radio_control/ppm_arch.h b/tests/modules/test_arch/modules/radio_control/ppm_arch.h similarity index 96% rename from tests/modules/test_arch/subsystems/radio_control/ppm_arch.h rename to tests/modules/test_arch/modules/radio_control/ppm_arch.h index ada3a5750d..eaf78fa4fc 100644 --- a/tests/modules/test_arch/subsystems/radio_control/ppm_arch.h +++ b/tests/modules/test_arch/modules/radio_control/ppm_arch.h @@ -19,7 +19,7 @@ */ /** - * @file subsystems/radio_control/ppm_arch.h + * @file modules/radio_control/ppm_arch.h * * PPM radio control, test specific. * diff --git a/tests/modules/test_arch/subsystems/radio_control/spektrum_arch.h b/tests/modules/test_arch/modules/radio_control/spektrum_arch.h similarity index 95% rename from tests/modules/test_arch/subsystems/radio_control/spektrum_arch.h rename to tests/modules/test_arch/modules/radio_control/spektrum_arch.h index ffdc9f964a..3a272317e4 100644 --- a/tests/modules/test_arch/subsystems/radio_control/spektrum_arch.h +++ b/tests/modules/test_arch/modules/radio_control/spektrum_arch.h @@ -23,7 +23,7 @@ #ifndef RADIO_CONTROL_SPEKTRUM_ARCH_H #define RADIO_CONTROL_SPEKTRUM_ARCH_H -#include "subsystems/radio_control/spektrum_radio.h" +#include "modules/radio_control/spektrum_radio.h" extern void spektrum_event(void (*_received_frame_handler)(void)); #define RadioControlEventImp spektrum_event