From a771280b50851b67211219aca27eaabcb6caf1c0 Mon Sep 17 00:00:00 2001 From: Martin Budden Date: Tue, 18 Oct 2016 08:37:45 +0100 Subject: [PATCH] Moved config.c from config directory to fc directory --- Makefile | 14 +++++++------- src/main/blackbox/blackbox.c | 2 +- src/main/blackbox/blackbox_io.c | 2 +- src/main/config/config_eeprom.c | 1 - src/main/config/config_profile.h | 2 +- src/main/config/feature.c | 1 - src/main/{config => fc}/config.c | 10 +++++----- src/main/{config => fc}/config.h | 0 src/main/fc/fc_msp.c | 4 ++-- src/main/fc/fc_tasks.c | 6 +++--- src/main/fc/mw.c | 4 ++-- src/main/fc/rc_controls.c | 6 +++--- src/main/fc/rc_curves.c | 2 +- src/main/flight/failsafe.c | 12 +++++++----- src/main/flight/gtune.c | 3 +-- src/main/flight/mixer.c | 4 ++-- src/main/flight/navigation.c | 9 ++++----- src/main/io/beeper.c | 2 +- src/main/io/display.c | 5 ++--- src/main/io/gps.c | 4 ++-- src/main/io/ledstrip.c | 9 ++++----- src/main/io/osd.c | 2 +- src/main/io/serial_cli.c | 2 +- src/main/io/transponder_ir.c | 4 ++-- src/main/main.c | 4 ++-- src/main/rx/pwm.c | 3 ++- src/main/rx/rx.c | 2 +- src/main/rx/rx_spi.c | 3 ++- src/main/rx/spektrum.c | 5 ++--- src/main/sensors/acceleration.c | 9 ++++++--- src/main/sensors/battery.c | 2 +- src/main/sensors/compass.c | 5 ++--- src/main/sensors/sonar.c | 3 ++- src/main/target/ALIENFLIGHTF1/config.c | 1 - src/main/target/ALIENFLIGHTF3/config.c | 1 - src/main/target/ALIENFLIGHTF4/config.c | 1 - src/main/target/COLIBRI/config.c | 1 - src/main/target/COLIBRI_RACE/config.c | 1 - src/main/target/COLIBRI_RACE/i2c_bst.c | 4 ++-- src/main/target/MOTOLAB/config.c | 1 - src/main/target/NAZE/config.c | 1 - src/main/target/RACEBASE/config.c | 1 - src/main/telemetry/frsky.c | 13 ++++++------- src/main/telemetry/ltm.c | 8 ++++---- src/main/telemetry/smartport.c | 12 ++++++------ src/main/telemetry/telemetry.c | 6 +++--- 46 files changed, 94 insertions(+), 103 deletions(-) rename src/main/{config => fc}/config.c (99%) rename src/main/{config => fc}/config.h (100%) diff --git a/Makefile b/Makefile index 1266aadf7..8ae93eb9c 100644 --- a/Makefile +++ b/Makefile @@ -396,19 +396,15 @@ COMMON_SRC = \ build/version.c \ $(TARGET_DIR_SRC) \ main.c \ - fc/mw.c \ - fc/fc_tasks.c \ common/encoding.c \ common/filter.c \ common/maths.c \ common/printf.c \ common/streambuf.c \ common/typeconversion.c \ - config/config.c \ config/config_eeprom.c \ config/feature.c \ config/parameter_group.c \ - fc/runtime_config.c \ drivers/adc.c \ drivers/buf_writer.c \ drivers/bus_i2c_soft.c \ @@ -429,6 +425,13 @@ COMMON_SRC = \ drivers/sound_beeper.c \ drivers/system.c \ drivers/timer.c \ + fc/config.c \ + fc/fc_tasks.c \ + fc/fc_msp.c \ + fc/mw.c \ + fc/rc_controls.c \ + fc/rc_curves.c \ + fc/runtime_config.c \ flight/altitudehold.c \ flight/failsafe.c \ flight/imu.c \ @@ -436,9 +439,6 @@ COMMON_SRC = \ flight/pid.c \ flight/pid_legacy.c \ flight/pid_betaflight.c \ - fc/fc_msp.c \ - fc/rc_controls.c \ - fc/rc_curves.c \ io/beeper.c \ io/serial.c \ io/serial_4way.c \ diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c index 369ac0c1c..c0c4bd9ef 100644 --- a/src/main/blackbox/blackbox.c +++ b/src/main/blackbox/blackbox.c @@ -37,6 +37,7 @@ #include "drivers/compass.h" #include "drivers/system.h" +#include "fc/config.h" #include "fc/rc_controls.h" #include "fc/runtime_config.h" @@ -48,7 +49,6 @@ #include "sensors/compass.h" #include "sensors/sonar.h" -#include "config/config.h" #include "config/config_profile.h" #include "config/config_master.h" #include "config/feature.h" diff --git a/src/main/blackbox/blackbox_io.c b/src/main/blackbox/blackbox_io.c index 9d9706c69..05f1d2d57 100644 --- a/src/main/blackbox/blackbox_io.c +++ b/src/main/blackbox/blackbox_io.c @@ -16,6 +16,7 @@ #include "common/encoding.h" #include "common/printf.h" +#include "fc/config.h" #include "fc/rc_controls.h" #include "flight/pid.h" @@ -25,7 +26,6 @@ #include "msp/msp_serial.h" -#include "config/config.h" #include "config/config_profile.h" #include "config/config_master.h" diff --git a/src/main/config/config_eeprom.c b/src/main/config/config_eeprom.c index 8763e06b9..fae660477 100644 --- a/src/main/config/config_eeprom.c +++ b/src/main/config/config_eeprom.c @@ -27,7 +27,6 @@ #include "build/build_config.h" -#include "config/config.h" #include "config/config_eeprom.h" #include "config/config_master.h" diff --git a/src/main/config/config_profile.h b/src/main/config/config_profile.h index b66233df0..a0ffa5390 100644 --- a/src/main/config/config_profile.h +++ b/src/main/config/config_profile.h @@ -17,8 +17,8 @@ #pragma once -#include "config/config.h" #include "common/axis.h" +#include "fc/config.h" #include "fc/rc_controls.h" #include "flight/pid.h" diff --git a/src/main/config/feature.c b/src/main/config/feature.c index 9d4e2c2b7..758e202a2 100644 --- a/src/main/config/feature.c +++ b/src/main/config/feature.c @@ -21,7 +21,6 @@ #include "platform.h" -#include "config/config.h" #include "config/config_master.h" #include "config/feature.h" diff --git a/src/main/config/config.c b/src/main/fc/config.c similarity index 99% rename from src/main/config/config.c rename to src/main/fc/config.c index e24c80fde..a7c3a7f7c 100755 --- a/src/main/config/config.c +++ b/src/main/fc/config.c @@ -43,6 +43,11 @@ #include "drivers/max7456.h" #include "drivers/sound_beeper.h" +#include "fc/config.h" +#include "fc/rc_controls.h" +#include "fc/rc_curves.h" +#include "fc/runtime_config.h" + #include "sensors/sensors.h" #include "sensors/gyro.h" #include "sensors/compass.h" @@ -56,8 +61,6 @@ #include "io/gimbal.h" #include "io/motors.h" #include "io/servos.h" -#include "fc/rc_controls.h" -#include "fc/rc_curves.h" #include "io/ledstrip.h" #include "io/gps.h" #include "io/osd.h" @@ -75,9 +78,6 @@ #include "flight/altitudehold.h" #include "flight/navigation.h" -#include "fc/runtime_config.h" - -#include "config/config.h" #include "config/config_eeprom.h" #include "config/config_profile.h" #include "config/config_master.h" diff --git a/src/main/config/config.h b/src/main/fc/config.h similarity index 100% rename from src/main/config/config.h rename to src/main/fc/config.h diff --git a/src/main/fc/fc_msp.c b/src/main/fc/fc_msp.c index 8c8166ce5..e14841ed1 100755 --- a/src/main/fc/fc_msp.c +++ b/src/main/fc/fc_msp.c @@ -49,8 +49,9 @@ #include "drivers/max7456.h" #include "drivers/vtx_soft_spi_rtc6705.h" -#include "fc/fc_msp.h" +#include "fc/config.h" #include "fc/mw.h" +#include "fc/fc_msp.h" #include "fc/rc_controls.h" #include "fc/runtime_config.h" @@ -95,7 +96,6 @@ #include "flight/navigation.h" #include "flight/altitudehold.h" -#include "config/config.h" #include "config/config_eeprom.h" #include "config/config_profile.h" #include "config/config_master.h" diff --git a/src/main/fc/fc_tasks.c b/src/main/fc/fc_tasks.c index a7d942287..d3d088f29 100644 --- a/src/main/fc/fc_tasks.c +++ b/src/main/fc/fc_tasks.c @@ -30,6 +30,7 @@ #include "drivers/compass.h" #include "drivers/serial.h" +#include "fc/config.h" #include "fc/fc_tasks.h" #include "fc/mw.h" #include "fc/rc_controls.h" @@ -51,8 +52,6 @@ #include "rx/rx.h" -#include "telemetry/telemetry.h" - #include "sensors/sensors.h" #include "sensors/acceleration.h" #include "sensors/barometer.h" @@ -63,7 +62,8 @@ #include "scheduler/scheduler.h" -#include "config/config.h" +#include "telemetry/telemetry.h" + #include "config/feature.h" #include "config/config_profile.h" #include "config/config_master.h" diff --git a/src/main/fc/mw.c b/src/main/fc/mw.c index aa6b7cd3a..9087592a2 100644 --- a/src/main/fc/mw.c +++ b/src/main/fc/mw.c @@ -44,8 +44,10 @@ #include "sensors/gyro.h" #include "sensors/battery.h" +#include "fc/config.h" #include "fc/rc_controls.h" #include "fc/rc_curves.h" +#include "fc/runtime_config.h" #include "msp/msp_serial.h" @@ -68,8 +70,6 @@ #include "flight/gtune.h" #include "flight/altitudehold.h" -#include "fc/runtime_config.h" -#include "config/config.h" #include "config/config_profile.h" #include "config/config_master.h" #include "config/feature.h" diff --git a/src/main/fc/rc_controls.c b/src/main/fc/rc_controls.c index 1402d2b6c..314ee07ec 100644 --- a/src/main/fc/rc_controls.c +++ b/src/main/fc/rc_controls.c @@ -28,9 +28,11 @@ #include "common/axis.h" #include "common/maths.h" -#include "config/config.h" #include "config/feature.h" +#include "fc/config.h" +#include "fc/rc_controls.h" +#include "fc/rc_curves.h" #include "fc/runtime_config.h" #include "drivers/system.h" @@ -48,8 +50,6 @@ #include "io/gps.h" #include "io/beeper.h" #include "io/motors.h" -#include "fc/rc_controls.h" -#include "fc/rc_curves.h" #include "io/vtx.h" #include "io/display.h" diff --git a/src/main/fc/rc_curves.c b/src/main/fc/rc_curves.c index 760f276f9..8f447cb2c 100644 --- a/src/main/fc/rc_curves.c +++ b/src/main/fc/rc_curves.c @@ -20,11 +20,11 @@ #include "platform.h" -#include "config/config.h" #include "config/feature.h" #include "io/motors.h" +#include "fc/config.h" #include "fc/rc_curves.h" #include "fc/rc_controls.h" diff --git a/src/main/flight/failsafe.c b/src/main/flight/failsafe.c index 3df88b66e..c0603b4f0 100644 --- a/src/main/flight/failsafe.c +++ b/src/main/flight/failsafe.c @@ -24,17 +24,19 @@ #include "common/axis.h" -#include "rx/rx.h" #include "drivers/system.h" -#include "io/beeper.h" -#include "io/motors.h" + +#include "fc/config.h" #include "fc/rc_controls.h" #include "fc/runtime_config.h" -#include "config/config.h" - #include "flight/failsafe.h" +#include "io/beeper.h" +#include "io/motors.h" + +#include "rx/rx.h" + /* * Usage: * diff --git a/src/main/flight/gtune.c b/src/main/flight/gtune.c index 17c502754..e4e85fc62 100644 --- a/src/main/flight/gtune.c +++ b/src/main/flight/gtune.c @@ -38,11 +38,10 @@ #include "flight/pid.h" #include "flight/imu.h" -#include "config/config.h" #include "blackbox/blackbox.h" +#include "fc/config.h" #include "fc/rc_controls.h" - #include "fc/runtime_config.h" diff --git a/src/main/flight/mixer.c b/src/main/flight/mixer.c index 77e627540..48b7f490e 100755 --- a/src/main/flight/mixer.c +++ b/src/main/flight/mixer.c @@ -41,7 +41,6 @@ #include "io/gimbal.h" #include "io/motors.h" #include "io/servos.h" -#include "fc/rc_controls.h" #include "sensors/sensors.h" #include "sensors/acceleration.h" @@ -52,9 +51,10 @@ #include "flight/pid.h" #include "flight/imu.h" +#include "fc/config.h" +#include "fc/rc_controls.h" #include "fc/runtime_config.h" -#include "config/config.h" #include "config/feature.h" uint8_t motorCount; diff --git a/src/main/flight/navigation.c b/src/main/flight/navigation.c index 6b77ca61f..133ba5636 100644 --- a/src/main/flight/navigation.c +++ b/src/main/flight/navigation.c @@ -37,6 +37,10 @@ #include "drivers/sensor.h" #include "drivers/accgyro.h" +#include "fc/config.h" +#include "fc/rc_controls.h" +#include "fc/runtime_config.h" + #include "sensors/sensors.h" #include "sensors/boardalignment.h" #include "sensors/acceleration.h" @@ -44,7 +48,6 @@ #include "io/beeper.h" #include "io/serial.h" #include "io/gps.h" -#include "fc/rc_controls.h" #include "flight/pid.h" #include "flight/navigation.h" @@ -54,10 +57,6 @@ #include "rx/rx.h" -#include "config/config.h" -#include "fc/runtime_config.h" - - extern int16_t magHold; #ifdef GPS diff --git a/src/main/io/beeper.c b/src/main/io/beeper.c index f4f7205f0..531afe605 100644 --- a/src/main/io/beeper.c +++ b/src/main/io/beeper.c @@ -38,9 +38,9 @@ #include "io/gps.h" #endif +#include "fc/config.h" #include "fc/runtime_config.h" -#include "config/config.h" #include "config/feature.h" #include "io/beeper.h" diff --git a/src/main/io/display.c b/src/main/io/display.c index 032922af0..f2bf158a4 100644 --- a/src/main/io/display.c +++ b/src/main/io/display.c @@ -46,7 +46,9 @@ #include "sensors/acceleration.h" #include "sensors/gyro.h" +#include "fc/config.h" #include "fc/rc_controls.h" +#include "fc/runtime_config.h" #include "flight/pid.h" #include "flight/imu.h" @@ -57,10 +59,7 @@ #include "flight/navigation.h" #endif -#include "config/config.h" #include "config/feature.h" -#include "fc/runtime_config.h" - #include "config/config_profile.h" #include "io/display.h" diff --git a/src/main/io/gps.c b/src/main/io/gps.c index 52dfecc17..59fca7dee 100755 --- a/src/main/io/gps.c +++ b/src/main/io/gps.c @@ -49,10 +49,10 @@ #include "flight/pid.h" #include "flight/navigation.h" -#include "config/config.h" -#include "config/feature.h" +#include "fc/config.h" #include "fc/runtime_config.h" +#include "config/feature.h" #define LOG_ERROR '?' #define LOG_IGNORED '!' diff --git a/src/main/io/ledstrip.c b/src/main/io/ledstrip.c index f0b3e44e0..baeb80c95 100644 --- a/src/main/io/ledstrip.c +++ b/src/main/io/ledstrip.c @@ -44,7 +44,9 @@ #include "common/axis.h" #include "common/utils.h" +#include "fc/config.h" #include "fc/rc_controls.h" +#include "fc/runtime_config.h" #include "sensors/battery.h" #include "sensors/sensors.h" @@ -63,19 +65,16 @@ #include "io/osd.h" #include "io/vtx.h" -#include "rx/rx.h" - #include "flight/failsafe.h" #include "flight/mixer.h" #include "flight/pid.h" #include "flight/imu.h" #include "flight/navigation.h" +#include "rx/rx.h" + #include "telemetry/telemetry.h" -#include "fc/runtime_config.h" - -#include "config/config.h" #include "config/config_profile.h" #include "config/config_master.h" #include "config/feature.h" diff --git a/src/main/io/osd.c b/src/main/io/osd.c index ac099ab7d..c9ad4c1d5 100755 --- a/src/main/io/osd.c +++ b/src/main/io/osd.c @@ -38,12 +38,12 @@ #include "io/flashfs.h" #include "io/osd.h" +#include "fc/config.h" #include "fc/rc_controls.h" #include "fc/runtime_config.h" #include "flight/pid.h" -#include "config/config.h" #include "config/config_profile.h" #include "config/config_master.h" #include "config/feature.h" diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c index 8fd14951a..6689fcaf6 100755 --- a/src/main/io/serial_cli.c +++ b/src/main/io/serial_cli.c @@ -56,6 +56,7 @@ uint8_t cliMode = 0; #include "drivers/sdcard.h" #include "drivers/buf_writer.h" +#include "fc/config.h" #include "fc/rc_controls.h" #include "fc/runtime_config.h" @@ -94,7 +95,6 @@ uint8_t cliMode = 0; #include "telemetry/telemetry.h" #include "telemetry/frsky.h" -#include "config/config.h" #include "config/config_eeprom.h" #include "config/config_profile.h" #include "config/config_master.h" diff --git a/src/main/io/transponder_ir.c b/src/main/io/transponder_ir.c index 10626d2eb..5ca4ba23e 100644 --- a/src/main/io/transponder_ir.c +++ b/src/main/io/transponder_ir.c @@ -27,11 +27,11 @@ #include "drivers/transponder_ir.h" #include "drivers/system.h" - #include "drivers/usb_io.h" +#include "fc/config.h" + #include "io/transponder_ir.h" -#include "config/config.h" static bool transponderInitialised = false; static bool transponderRepeat = false; diff --git a/src/main/main.c b/src/main/main.c index c495a2eb5..813b23b42 100644 --- a/src/main/main.c +++ b/src/main/main.c @@ -63,8 +63,9 @@ #include "bus_bst.h" #endif -#include "fc/fc_msp.h" +#include "fc/config.h" #include "fc/fc_tasks.h" +#include "fc/fc_msp.h" #include "fc/rc_controls.h" #include "fc/runtime_config.h" @@ -108,7 +109,6 @@ #include "flight/failsafe.h" #include "flight/navigation.h" -#include "config/config.h" #include "config/config_eeprom.h" #include "config/config_profile.h" #include "config/config_master.h" diff --git a/src/main/rx/pwm.c b/src/main/rx/pwm.c index b8f0c8994..b9a0d52e3 100644 --- a/src/main/rx/pwm.c +++ b/src/main/rx/pwm.c @@ -30,7 +30,8 @@ #include "drivers/timer.h" #include "drivers/pwm_rx.h" -#include "config/config.h" +#include "fc/config.h" + #include "config/feature.h" #include "rx/rx.h" diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c index 7a148428b..29c3a111a 100644 --- a/src/main/rx/rx.c +++ b/src/main/rx/rx.c @@ -28,7 +28,6 @@ #include "common/maths.h" -#include "config/config.h" #include "config/feature.h" #include "drivers/serial.h" @@ -39,6 +38,7 @@ #include "drivers/rx_spi.h" #include "drivers/system.h" +#include "fc/config.h" #include "fc/rc_controls.h" #include "flight/failsafe.h" diff --git a/src/main/rx/rx_spi.c b/src/main/rx/rx_spi.c index e7f3bdea0..f8fc71122 100644 --- a/src/main/rx/rx_spi.c +++ b/src/main/rx/rx_spi.c @@ -26,9 +26,10 @@ #include "drivers/rx_nrf24l01.h" -#include "config/config.h" #include "config/feature.h" +#include "fc/config.h" + #include "rx/rx.h" #include "rx/rx_spi.h" #include "rx/nrf24_cx10.h" diff --git a/src/main/rx/spektrum.c b/src/main/rx/spektrum.c index 6312f82c0..be8e13507 100644 --- a/src/main/rx/spektrum.c +++ b/src/main/rx/spektrum.c @@ -28,14 +28,13 @@ #include "drivers/io.h" #include "drivers/io_impl.h" #include "drivers/system.h" - #include "drivers/light_led.h" - #include "drivers/serial.h" #include "drivers/serial_uart.h" + #include "io/serial.h" -#include "config/config.h" +#include "fc/config.h" #ifdef TELEMETRY #include "telemetry/telemetry.h" diff --git a/src/main/sensors/acceleration.c b/src/main/sensors/acceleration.c index 97b75326c..8c23bccd4 100644 --- a/src/main/sensors/acceleration.c +++ b/src/main/sensors/acceleration.c @@ -30,13 +30,16 @@ #include "drivers/accgyro.h" #include "drivers/system.h" -#include "sensors/sensors.h" +#include "fc/config.h" + #include "io/beeper.h" + +#include "sensors/sensors.h" +#include "sensors/acceleration.h" #include "sensors/boardalignment.h" -#include "config/config.h" + #include "config/feature.h" -#include "sensors/acceleration.h" int32_t accSmooth[XYZ_AXIS_COUNT]; diff --git a/src/main/sensors/battery.c b/src/main/sensors/battery.c index fab68e1c1..77a852782 100644 --- a/src/main/sensors/battery.c +++ b/src/main/sensors/battery.c @@ -28,9 +28,9 @@ #include "drivers/adc.h" #include "drivers/system.h" +#include "fc/config.h" #include "fc/runtime_config.h" -#include "config/config.h" #include "config/feature.h" #include "sensors/battery.h" diff --git a/src/main/sensors/compass.c b/src/main/sensors/compass.c index 7bd2fb198..30b34d83f 100644 --- a/src/main/sensors/compass.c +++ b/src/main/sensors/compass.c @@ -27,12 +27,11 @@ #include "drivers/compass_hmc5883l.h" #include "drivers/light_led.h" -#include "sensors/boardalignment.h" +#include "fc/config.h" #include "fc/runtime_config.h" -#include "config/config.h" - #include "sensors/sensors.h" +#include "sensors/boardalignment.h" #include "sensors/compass.h" #ifdef USE_HARDWARE_REVISION_DETECTION diff --git a/src/main/sensors/sonar.c b/src/main/sensors/sonar.c index 6c7b18143..ef6ce3b70 100644 --- a/src/main/sensors/sonar.c +++ b/src/main/sensors/sonar.c @@ -30,9 +30,10 @@ #include "drivers/sonar_hcsr04.h" #include "drivers/io.h" + +#include "fc/config.h" #include "fc/runtime_config.h" -#include "config/config.h" #include "config/feature.h" #include "sensors/sensors.h" diff --git a/src/main/target/ALIENFLIGHTF1/config.c b/src/main/target/ALIENFLIGHTF1/config.c index 07b1365f1..0b93be5f5 100644 --- a/src/main/target/ALIENFLIGHTF1/config.c +++ b/src/main/target/ALIENFLIGHTF1/config.c @@ -28,7 +28,6 @@ #include "rx/rx.h" -#include "config/config.h" #include "config/config_profile.h" #include "config/config_master.h" diff --git a/src/main/target/ALIENFLIGHTF3/config.c b/src/main/target/ALIENFLIGHTF3/config.c index 2ddb49c68..5064be485 100644 --- a/src/main/target/ALIENFLIGHTF3/config.c +++ b/src/main/target/ALIENFLIGHTF3/config.c @@ -36,7 +36,6 @@ #include "sensors/sensors.h" #include "sensors/compass.h" -#include "config/config.h" #include "config/config_profile.h" #include "config/config_master.h" diff --git a/src/main/target/ALIENFLIGHTF4/config.c b/src/main/target/ALIENFLIGHTF4/config.c index b357b9c7b..4e3228296 100644 --- a/src/main/target/ALIENFLIGHTF4/config.c +++ b/src/main/target/ALIENFLIGHTF4/config.c @@ -36,7 +36,6 @@ #include "sensors/sensors.h" #include "sensors/compass.h" -#include "config/config.h" #include "config/config_profile.h" #include "config/config_master.h" diff --git a/src/main/target/COLIBRI/config.c b/src/main/target/COLIBRI/config.c index 3e5a5d99f..83f103e6e 100644 --- a/src/main/target/COLIBRI/config.c +++ b/src/main/target/COLIBRI/config.c @@ -32,7 +32,6 @@ #include "rx/rx.h" -#include "config/config.h" #include "config/config_profile.h" #include "config/config_master.h" diff --git a/src/main/target/COLIBRI_RACE/config.c b/src/main/target/COLIBRI_RACE/config.c index 3c3860c0b..9ef0cf49b 100644 --- a/src/main/target/COLIBRI_RACE/config.c +++ b/src/main/target/COLIBRI_RACE/config.c @@ -24,7 +24,6 @@ #include "sensors/battery.h" -#include "config/config.h" #include "config/config_master.h" diff --git a/src/main/target/COLIBRI_RACE/i2c_bst.c b/src/main/target/COLIBRI_RACE/i2c_bst.c index e6475aa18..a9cd9ff46 100644 --- a/src/main/target/COLIBRI_RACE/i2c_bst.c +++ b/src/main/target/COLIBRI_RACE/i2c_bst.c @@ -33,7 +33,6 @@ #include "io/motors.h" #include "io/servos.h" -#include "fc/rc_controls.h" #include "io/gps.h" #include "io/gimbal.h" #include "io/serial.h" @@ -59,10 +58,11 @@ #include "flight/navigation.h" #include "flight/altitudehold.h" +#include "fc/config.h" #include "fc/mw.h" +#include "fc/rc_controls.h" #include "fc/runtime_config.h" -#include "config/config.h" #include "config/config_eeprom.h" #include "config/config_profile.h" #include "config/config_master.h" diff --git a/src/main/target/MOTOLAB/config.c b/src/main/target/MOTOLAB/config.c index 0754d268c..4cd38f98f 100755 --- a/src/main/target/MOTOLAB/config.c +++ b/src/main/target/MOTOLAB/config.c @@ -20,7 +20,6 @@ #include -#include "config/config.h" #include "config/config_master.h" diff --git a/src/main/target/NAZE/config.c b/src/main/target/NAZE/config.c index faf1b43b9..9efa2c583 100755 --- a/src/main/target/NAZE/config.c +++ b/src/main/target/NAZE/config.c @@ -28,7 +28,6 @@ #include "rx/rx.h" -#include "config/config.h" #include "config/config_profile.h" #include "config/config_master.h" diff --git a/src/main/target/RACEBASE/config.c b/src/main/target/RACEBASE/config.c index fb6db5a64..32bace066 100755 --- a/src/main/target/RACEBASE/config.c +++ b/src/main/target/RACEBASE/config.c @@ -22,7 +22,6 @@ #include "rx/rx.h" -#include "config/config.h" #include "config/config_master.h" diff --git a/src/main/telemetry/frsky.c b/src/main/telemetry/frsky.c index aa704142a..800ff2435 100644 --- a/src/main/telemetry/frsky.c +++ b/src/main/telemetry/frsky.c @@ -31,6 +31,8 @@ #include "common/maths.h" #include "common/axis.h" +#include "config/feature.h" + #include "drivers/system.h" #include "drivers/sensor.h" #include "drivers/accgyro.h" @@ -38,6 +40,9 @@ #include "drivers/timer.h" #include "drivers/serial.h" +#include "fc/config.h" +#include "fc/rc_controls.h" +#include "fc/runtime_config.h" #include "sensors/sensors.h" #include "sensors/acceleration.h" @@ -46,20 +51,14 @@ #include "sensors/battery.h" #include "io/serial.h" -#include "fc/rc_controls.h" #include "io/gps.h" -#include "rx/rx.h" - #include "flight/mixer.h" #include "flight/pid.h" #include "flight/imu.h" #include "flight/altitudehold.h" -#include "fc/runtime_config.h" - -#include "config/config.h" -#include "config/feature.h" +#include "rx/rx.h" #include "telemetry/telemetry.h" #include "telemetry/frsky.h" diff --git a/src/main/telemetry/ltm.c b/src/main/telemetry/ltm.c index 47bfe2098..691d208c6 100644 --- a/src/main/telemetry/ltm.c +++ b/src/main/telemetry/ltm.c @@ -49,6 +49,10 @@ #include "drivers/serial.h" #include "drivers/pwm_rx.h" +#include "fc/config.h" +#include "fc/rc_controls.h" +#include "fc/runtime_config.h" + #include "sensors/sensors.h" #include "sensors/acceleration.h" #include "sensors/gyro.h" @@ -57,7 +61,6 @@ #include "sensors/battery.h" #include "io/serial.h" -#include "fc/rc_controls.h" #include "io/gimbal.h" #include "io/gps.h" #include "io/ledstrip.h" @@ -77,9 +80,6 @@ #include "telemetry/telemetry.h" #include "telemetry/ltm.h" -#include "config/config.h" -#include "fc/runtime_config.h" - #define TELEMETRY_LTM_INITIAL_PORT_MODE MODE_TX #define LTM_CYCLETIME 100 diff --git a/src/main/telemetry/smartport.c b/src/main/telemetry/smartport.c index 2152a9096..0e9fb6fa0 100644 --- a/src/main/telemetry/smartport.c +++ b/src/main/telemetry/smartport.c @@ -27,12 +27,12 @@ #include "drivers/adc.h" #include "drivers/light_led.h" -#include "rx/rx.h" -#include "rx/msp.h" +#include "fc/config.h" +#include "fc/rc_controls.h" +#include "fc/runtime_config.h" #include "io/beeper.h" #include "io/motors.h" -#include "fc/rc_controls.h" #include "io/gps.h" #include "io/gimbal.h" #include "io/serial.h" @@ -55,12 +55,12 @@ #include "flight/navigation.h" #include "flight/altitudehold.h" +#include "rx/rx.h" +#include "rx/msp.h" + #include "telemetry/telemetry.h" #include "telemetry/smartport.h" -#include "fc/runtime_config.h" - -#include "config/config.h" #include "config/config_profile.h" #include "config/feature.h" diff --git a/src/main/telemetry/telemetry.c b/src/main/telemetry/telemetry.c index a93e21c2a..fe03a9b9a 100644 --- a/src/main/telemetry/telemetry.c +++ b/src/main/telemetry/telemetry.c @@ -26,14 +26,14 @@ #include "drivers/timer.h" #include "drivers/serial.h" #include "drivers/serial_softserial.h" + #include "io/serial.h" -#include "rx/rx.h" +#include "fc/config.h" #include "fc/rc_controls.h" - #include "fc/runtime_config.h" -#include "config/config.h" +#include "rx/rx.h" #include "telemetry/telemetry.h" #include "telemetry/frsky.h"