From 944adb06f8c2f5794aac45f35b98a28e2c1e332c Mon Sep 17 00:00:00 2001 From: Martin Budden Date: Mon, 8 Aug 2016 18:08:18 +0100 Subject: [PATCH] Minor changes to directory structure to reflect changes in Cleanflight and betaflight --- Makefile | 20 +++++++++---------- src/main/blackbox/blackbox.c | 8 +++++--- src/main/blackbox/blackbox_io.c | 11 +++++----- src/main/{common => build}/atomic.h | 0 src/main/{ => build}/build_config.c | 0 src/main/{ => build}/build_config.h | 0 src/main/{ => build}/debug.c | 0 src/main/{ => build}/debug.h | 0 src/main/{ => build}/version.c | 0 src/main/{ => build}/version.h | 0 src/main/common/printf.c | 6 ++++-- src/main/common/typeconversion.c | 3 ++- src/main/config/config.c | 10 ++++++---- src/main/drivers/accgyro_l3gd20.c | 6 ++++-- src/main/drivers/accgyro_lsm303dlhc.c | 3 ++- src/main/drivers/accgyro_mpu.c | 6 ++++-- src/main/drivers/accgyro_mpu6050.c | 6 ++++-- src/main/drivers/accgyro_spi_mpu9250.c | 3 ++- src/main/drivers/adc.c | 6 ++++-- src/main/drivers/adc_stm32f10x.c | 3 ++- src/main/drivers/barometer_bmp085.c | 3 ++- src/main/drivers/barometer_bmp280.c | 3 ++- src/main/drivers/barometer_ms5611.c | 3 ++- src/main/drivers/bus_i2c_soft.c | 3 ++- src/main/drivers/bus_spi_soft.c | 3 ++- src/main/drivers/compass_ak8963.c | 6 ++++-- src/main/drivers/compass_ak8975.c | 3 ++- src/main/drivers/compass_hmc5883l.c | 3 ++- src/main/drivers/compass_mag3110.c | 3 ++- src/main/drivers/gpio_stm32f4xx.c | 3 ++- src/main/drivers/gps_i2cnav.c | 3 ++- src/main/drivers/gyro_sync.c | 6 ++++-- src/main/drivers/light_ws2811strip.c | 3 ++- src/main/drivers/pwm_rx.c | 6 ++++-- src/main/drivers/rx_nrf24l01.c | 3 ++- src/main/drivers/serial_softserial.c | 5 +++-- src/main/drivers/serial_uart.c | 3 ++- src/main/drivers/serial_usb_vcp.c | 3 ++- src/main/drivers/sonar_hcsr04.c | 3 ++- src/main/drivers/sonar_srf10.c | 3 ++- src/main/drivers/sound_beeper_stm32f10x.c | 3 ++- src/main/drivers/sound_beeper_stm32f30x.c | 3 ++- src/main/drivers/timer.c | 5 +++-- src/main/{ => fc}/mw.c | 10 ++++++---- src/main/{ => fc}/mw.h | 0 src/main/{io => fc}/rc_controls.c | 9 +++++---- src/main/{io => fc}/rc_controls.h | 0 src/main/{io => fc}/rc_curves.c | 4 ++-- src/main/{io => fc}/rc_curves.h | 4 +++- src/main/{config => fc}/runtime_config.c | 2 +- src/main/{config => fc}/runtime_config.h | 0 src/main/flight/failsafe.c | 12 +++++++---- src/main/flight/hil.c | 9 ++++++--- src/main/flight/imu.c | 12 +++++++---- src/main/flight/mixer.c | 12 +++++++---- src/main/flight/navigation_rewrite.c | 8 +++++--- src/main/flight/navigation_rewrite.h | 2 +- .../flight/navigation_rewrite_fixedwing.c | 6 +++--- src/main/flight/navigation_rewrite_geo.c | 6 +++--- .../flight/navigation_rewrite_multicopter.c | 11 +++++----- .../flight/navigation_rewrite_pos_estimator.c | 6 +++--- src/main/flight/navigation_rewrite_private.h | 2 +- src/main/flight/pid.c | 12 +++++++---- src/main/flight/pid.h | 12 ++++------- src/main/io/beeper.c | 9 ++++++--- src/main/io/display.c | 14 +++++++------ src/main/io/gps.c | 8 +++++--- src/main/io/gps_i2cnav.c | 6 +++--- src/main/io/gps_naza.c | 9 ++++++--- src/main/io/gps_nmea.c | 8 +++++--- src/main/io/gps_ublox.c | 8 +++++--- src/main/io/ledstrip.c | 16 ++++++++------- src/main/io/serial.c | 3 ++- src/main/io/serial_cli.c | 12 ++++++----- src/main/io/serial_msp.c | 14 +++++++------ src/main/main.c | 13 +++++++----- src/main/rx/ibus.c | 3 ++- src/main/rx/jetiexbus.c | 6 ++++-- src/main/rx/msp.c | 3 ++- src/main/rx/nrf24.c | 3 ++- src/main/rx/nrf24_cx10.c | 3 ++- src/main/rx/nrf24_h8_3d.c | 3 ++- src/main/rx/nrf24_syma.c | 3 ++- src/main/rx/nrf24_v202.c | 3 ++- src/main/rx/pwm.c | 3 ++- src/main/rx/rx.c | 9 ++++++--- src/main/rx/sbus.c | 3 ++- src/main/rx/spektrum.c | 3 ++- src/main/rx/sumd.c | 3 ++- src/main/rx/sumh.c | 3 ++- src/main/scheduler/scheduler.c | 6 ++++-- src/main/sensors/acceleration.c | 3 ++- src/main/sensors/battery.c | 6 ++++-- src/main/sensors/compass.c | 3 ++- src/main/sensors/initialisation.c | 6 ++++-- src/main/sensors/rangefinder.c | 6 ++++-- .../target/ALIENFLIGHTF3/hardware_revision.c | 3 ++- src/main/target/CJMCU/hardware_revision.c | 3 ++- src/main/target/NAZE/hardware_revision.c | 3 ++- src/main/telemetry/frsky.c | 4 +++- src/main/telemetry/hott.c | 13 ++++++++---- src/main/telemetry/ltm.c | 9 +++++++-- src/main/telemetry/mavlink.c | 12 ++++++----- src/main/telemetry/smartport.c | 4 +++- src/main/telemetry/telemetry.c | 6 ++++-- src/main/vcp/hw_config.c | 3 ++- 106 files changed, 357 insertions(+), 216 deletions(-) rename src/main/{common => build}/atomic.h (100%) rename src/main/{ => build}/build_config.c (100%) rename src/main/{ => build}/build_config.h (100%) rename src/main/{ => build}/debug.c (100%) rename src/main/{ => build}/debug.h (100%) rename src/main/{ => build}/version.c (100%) rename src/main/{ => build}/version.h (100%) rename src/main/{ => fc}/mw.c (99%) rename src/main/{ => fc}/mw.h (100%) rename src/main/{io => fc}/rc_controls.c (99%) rename src/main/{io => fc}/rc_controls.h (100%) rename src/main/{io => fc}/rc_curves.c (97%) rename src/main/{io => fc}/rc_curves.h (82%) rename src/main/{config => fc}/runtime_config.c (98%) rename src/main/{config => fc}/runtime_config.h (100%) diff --git a/Makefile b/Makefile index 4ad453c180..800d03a761 100644 --- a/Makefile +++ b/Makefile @@ -122,9 +122,9 @@ endif REVISION = $(shell git log -1 --format="%h") -FC_VER_MAJOR := $(shell grep " FC_VERSION_MAJOR" src/main/version.h | awk '{print $$3}' ) -FC_VER_MINOR := $(shell grep " FC_VERSION_MINOR" src/main/version.h | awk '{print $$3}' ) -FC_VER_PATCH := $(shell grep " FC_VERSION_PATCH" src/main/version.h | awk '{print $$3}' ) +FC_VER_MAJOR := $(shell grep " FC_VERSION_MAJOR" src/main/build/version.h | awk '{print $$3}' ) +FC_VER_MINOR := $(shell grep " FC_VERSION_MINOR" src/main/build/version.h | awk '{print $$3}' ) +FC_VER_PATCH := $(shell grep " FC_VERSION_PATCH" src/main/build/version.h | awk '{print $$3}' ) FC_VER := $(FC_VER_MAJOR).$(FC_VER_MINOR).$(FC_VER_PATCH) @@ -357,12 +357,12 @@ INCLUDE_DIRS := $(INCLUDE_DIRS) \ VPATH := $(VPATH):$(TARGET_DIR) COMMON_SRC = \ - build_config.c \ - debug.c \ - version.c \ + build/build_config.c \ + build/debug.c \ + build/version.c \ $(TARGET_DIR_SRC) \ main.c \ - mw.c \ + fc/mw.c \ common/encoding.c \ common/filter.c \ common/maths.c \ @@ -370,7 +370,7 @@ COMMON_SRC = \ common/typeconversion.c \ common/streambuf.c \ config/config.c \ - config/runtime_config.c \ + fc/runtime_config.c \ drivers/adc.c \ drivers/buf_writer.c \ drivers/bus_i2c_soft.c \ @@ -398,8 +398,8 @@ COMMON_SRC = \ flight/mixer.c \ flight/pid.c \ io/beeper.c \ - io/rc_controls.c \ - io/rc_curves.c \ + fc/rc_controls.c \ + fc/rc_curves.c \ io/serial.c \ io/serial_4way.c \ io/serial_4way_avrootloader.c \ diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c index 96e3857d01..13c12f9f38 100644 --- a/src/main/blackbox/blackbox.c +++ b/src/main/blackbox/blackbox.c @@ -20,10 +20,11 @@ #include #include "platform.h" -#include "version.h" #ifdef BLACKBOX +#include "build/version.h" + #include "common/maths.h" #include "common/axis.h" #include "common/color.h" @@ -49,10 +50,12 @@ #include "sensors/gyro.h" #include "sensors/battery.h" +#include "fc/rc_controls.h" +#include "fc/runtime_config.h" + #include "io/beeper.h" #include "io/display.h" #include "io/escservo.h" -#include "io/rc_controls.h" #include "io/gimbal.h" #include "io/gps.h" #include "io/ledstrip.h" @@ -71,7 +74,6 @@ #include "flight/imu.h" #include "flight/navigation_rewrite.h" -#include "config/runtime_config.h" #include "config/config.h" #include "config/config_profile.h" #include "config/config_master.h" diff --git a/src/main/blackbox/blackbox_io.c b/src/main/blackbox/blackbox_io.c index 79b5bd4367..6a72b1a7ad 100644 --- a/src/main/blackbox/blackbox_io.c +++ b/src/main/blackbox/blackbox_io.c @@ -21,8 +21,8 @@ #include "blackbox_io.h" -#include "version.h" -#include "build_config.h" +#include "build/version.h" +#include "build/build_config.h" #include "common/maths.h" #include "common/axis.h" @@ -52,7 +52,8 @@ #include "io/display.h" #include "io/escservo.h" #include "rx/rx.h" -#include "io/rc_controls.h" +#include "fc/rc_controls.h" + #include "io/gimbal.h" #include "io/gps.h" @@ -70,7 +71,7 @@ #include "flight/imu.h" #include "flight/navigation_rewrite.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" #include "config/config.h" #include "config/config_profile.h" #include "config/config_master.h" @@ -970,4 +971,4 @@ blackboxBufferReserveStatus_e blackboxDeviceReserveBufferSpace(int32_t bytes) } } -#endif \ No newline at end of file +#endif diff --git a/src/main/common/atomic.h b/src/main/build/atomic.h similarity index 100% rename from src/main/common/atomic.h rename to src/main/build/atomic.h diff --git a/src/main/build_config.c b/src/main/build/build_config.c similarity index 100% rename from src/main/build_config.c rename to src/main/build/build_config.c diff --git a/src/main/build_config.h b/src/main/build/build_config.h similarity index 100% rename from src/main/build_config.h rename to src/main/build/build_config.h diff --git a/src/main/debug.c b/src/main/build/debug.c similarity index 100% rename from src/main/debug.c rename to src/main/build/debug.c diff --git a/src/main/debug.h b/src/main/build/debug.h similarity index 100% rename from src/main/debug.h rename to src/main/build/debug.h diff --git a/src/main/version.c b/src/main/build/version.c similarity index 100% rename from src/main/version.c rename to src/main/build/version.c diff --git a/src/main/version.h b/src/main/build/version.h similarity index 100% rename from src/main/version.h rename to src/main/build/version.h diff --git a/src/main/common/printf.c b/src/main/common/printf.c index 706baa0535..a6840e228a 100644 --- a/src/main/common/printf.c +++ b/src/main/common/printf.c @@ -36,12 +36,14 @@ #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #include "drivers/serial.h" #include "io/serial.h" -#include "build_config.h" +#include "build/build_config.h" + #include "printf.h" #ifdef REQUIRE_PRINTF_LONG_SUPPORT diff --git a/src/main/common/typeconversion.c b/src/main/common/typeconversion.c index 4e3f8b4c2e..7f49706cf4 100644 --- a/src/main/common/typeconversion.c +++ b/src/main/common/typeconversion.c @@ -17,7 +17,8 @@ #include #include #include -#include "build_config.h" +#include "build/build_config.h" + #include "maths.h" #ifdef REQUIRE_PRINTF_LONG_SUPPORT diff --git a/src/main/config/config.c b/src/main/config/config.c index b404406a0c..a127eb1e53 100755 --- a/src/main/config/config.c +++ b/src/main/config/config.c @@ -21,7 +21,8 @@ #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #include "common/color.h" #include "common/axis.h" @@ -50,8 +51,8 @@ #include "io/serial.h" #include "io/gimbal.h" #include "io/escservo.h" -#include "io/rc_controls.h" -#include "io/rc_curves.h" +#include "fc/rc_controls.h" +#include "fc/rc_curves.h" #include "io/ledstrip.h" #include "io/gps.h" @@ -68,7 +69,8 @@ #include "flight/failsafe.h" #include "flight/navigation_rewrite.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" + #include "config/config.h" #include "config/config_profile.h" diff --git a/src/main/drivers/accgyro_l3gd20.c b/src/main/drivers/accgyro_l3gd20.c index e227d7f8d4..6a517a6958 100644 --- a/src/main/drivers/accgyro_l3gd20.c +++ b/src/main/drivers/accgyro_l3gd20.c @@ -19,8 +19,10 @@ #include #include "platform.h" -#include "build_config.h" -#include "debug.h" +#include "build/build_config.h" + +#include "build/debug.h" + #include "common/maths.h" diff --git a/src/main/drivers/accgyro_lsm303dlhc.c b/src/main/drivers/accgyro_lsm303dlhc.c index 80a270b9f1..a2f05d9b92 100644 --- a/src/main/drivers/accgyro_lsm303dlhc.c +++ b/src/main/drivers/accgyro_lsm303dlhc.c @@ -22,7 +22,8 @@ #ifdef USE_ACC_LSM303DLHC -#include "debug.h" +#include "build/debug.h" + #include "common/maths.h" #include "common/axis.h" diff --git a/src/main/drivers/accgyro_mpu.c b/src/main/drivers/accgyro_mpu.c index 4284697217..162df7cf7c 100644 --- a/src/main/drivers/accgyro_mpu.c +++ b/src/main/drivers/accgyro_mpu.c @@ -21,8 +21,10 @@ #include #include "platform.h" -#include "build_config.h" -#include "debug.h" +#include "build/build_config.h" + +#include "build/debug.h" + #include "common/maths.h" diff --git a/src/main/drivers/accgyro_mpu6050.c b/src/main/drivers/accgyro_mpu6050.c index e209f5e8d7..215a74cead 100644 --- a/src/main/drivers/accgyro_mpu6050.c +++ b/src/main/drivers/accgyro_mpu6050.c @@ -20,8 +20,10 @@ #include #include "platform.h" -#include "build_config.h" -#include "debug.h" +#include "build/build_config.h" + +#include "build/debug.h" + #include "common/maths.h" diff --git a/src/main/drivers/accgyro_spi_mpu9250.c b/src/main/drivers/accgyro_spi_mpu9250.c index 0406e6023c..c1fa690adb 100644 --- a/src/main/drivers/accgyro_spi_mpu9250.c +++ b/src/main/drivers/accgyro_spi_mpu9250.c @@ -38,7 +38,8 @@ #include "exti.h" #include "bus_spi.h" #include "gyro_sync.h" -#include "debug.h" +#include "build/debug.h" + #include "sensor.h" #include "accgyro.h" diff --git a/src/main/drivers/adc.c b/src/main/drivers/adc.c index 6bba109396..b897f2f9ff 100644 --- a/src/main/drivers/adc.c +++ b/src/main/drivers/adc.c @@ -19,8 +19,10 @@ #include #include "platform.h" -#include "build_config.h" -#include "debug.h" +#include "build/build_config.h" + +#include "build/debug.h" + #include "system.h" diff --git a/src/main/drivers/adc_stm32f10x.c b/src/main/drivers/adc_stm32f10x.c index 1ac85621d7..8cce52a17e 100644 --- a/src/main/drivers/adc_stm32f10x.c +++ b/src/main/drivers/adc_stm32f10x.c @@ -23,7 +23,8 @@ #ifdef USE_ADC -#include "build_config.h" +#include "build/build_config.h" + #include "system.h" #include "sensor.h" diff --git a/src/main/drivers/barometer_bmp085.c b/src/main/drivers/barometer_bmp085.c index 9b35646b6b..d9fce884a4 100644 --- a/src/main/drivers/barometer_bmp085.c +++ b/src/main/drivers/barometer_bmp085.c @@ -20,7 +20,8 @@ #include -#include "build_config.h" +#include "build/build_config.h" + #include "barometer.h" diff --git a/src/main/drivers/barometer_bmp280.c b/src/main/drivers/barometer_bmp280.c index 6d42458486..7ade17f145 100644 --- a/src/main/drivers/barometer_bmp280.c +++ b/src/main/drivers/barometer_bmp280.c @@ -20,7 +20,8 @@ #include -#include "build_config.h" +#include "build/build_config.h" + #include "barometer.h" diff --git a/src/main/drivers/barometer_ms5611.c b/src/main/drivers/barometer_ms5611.c index 413fe5e980..0448ff4ca9 100644 --- a/src/main/drivers/barometer_ms5611.c +++ b/src/main/drivers/barometer_ms5611.c @@ -25,7 +25,8 @@ #include "system.h" #include "bus_i2c.h" -#include "build_config.h" +#include "build/build_config.h" + // MS5611, Standard address 0x77 #define MS5611_ADDR 0x77 diff --git a/src/main/drivers/bus_i2c_soft.c b/src/main/drivers/bus_i2c_soft.c index 42ea8cadc9..540a139427 100644 --- a/src/main/drivers/bus_i2c_soft.c +++ b/src/main/drivers/bus_i2c_soft.c @@ -20,7 +20,8 @@ #include -#include "build_config.h" +#include "build/build_config.h" + #include "bus_i2c.h" #include "io.h" diff --git a/src/main/drivers/bus_spi_soft.c b/src/main/drivers/bus_spi_soft.c index 6b75a0e7f1..6207f6591e 100644 --- a/src/main/drivers/bus_spi_soft.c +++ b/src/main/drivers/bus_spi_soft.c @@ -22,7 +22,8 @@ #ifdef USE_SOFTSPI -#include "build_config.h" +#include "build/build_config.h" + #include "io.h" #include "io_impl.h" diff --git a/src/main/drivers/compass_ak8963.c b/src/main/drivers/compass_ak8963.c index d5b9a59dec..9073b19bbb 100755 --- a/src/main/drivers/compass_ak8963.c +++ b/src/main/drivers/compass_ak8963.c @@ -20,11 +20,13 @@ #include -#include "build_config.h" +#include "build/build_config.h" + #include "platform.h" -#include "debug.h" +#include "build/debug.h" + #include "common/axis.h" #include "common/maths.h" diff --git a/src/main/drivers/compass_ak8975.c b/src/main/drivers/compass_ak8975.c index 0647e5f231..771a8c7abb 100644 --- a/src/main/drivers/compass_ak8975.c +++ b/src/main/drivers/compass_ak8975.c @@ -24,7 +24,8 @@ #ifdef USE_MAG_AK8975 -#include "build_config.h" +#include "build/build_config.h" + #include "common/axis.h" #include "common/maths.h" diff --git a/src/main/drivers/compass_hmc5883l.c b/src/main/drivers/compass_hmc5883l.c index 10fa9b3c6d..f7424a7820 100644 --- a/src/main/drivers/compass_hmc5883l.c +++ b/src/main/drivers/compass_hmc5883l.c @@ -24,7 +24,8 @@ #ifdef USE_MAG_HMC5883 -#include "debug.h" +#include "build/debug.h" + #include "common/axis.h" #include "common/maths.h" diff --git a/src/main/drivers/compass_mag3110.c b/src/main/drivers/compass_mag3110.c index adde113545..0980d762ac 100755 --- a/src/main/drivers/compass_mag3110.c +++ b/src/main/drivers/compass_mag3110.c @@ -24,7 +24,8 @@ #ifdef USE_MAG_MAG3110 -#include "build_config.h" +#include "build/build_config.h" + #include "common/axis.h" #include "common/maths.h" diff --git a/src/main/drivers/gpio_stm32f4xx.c b/src/main/drivers/gpio_stm32f4xx.c index 0129bf68f4..0d375aa66a 100644 --- a/src/main/drivers/gpio_stm32f4xx.c +++ b/src/main/drivers/gpio_stm32f4xx.c @@ -20,7 +20,8 @@ #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #include "gpio.h" diff --git a/src/main/drivers/gps_i2cnav.c b/src/main/drivers/gps_i2cnav.c index c9e5760e30..4cda059404 100755 --- a/src/main/drivers/gps_i2cnav.c +++ b/src/main/drivers/gps_i2cnav.c @@ -20,7 +20,8 @@ #include -#include "build_config.h" +#include "build/build_config.h" + #include "gps_i2cnav.h" diff --git a/src/main/drivers/gyro_sync.c b/src/main/drivers/gyro_sync.c index bc3bcc567a..1d228674e3 100644 --- a/src/main/drivers/gyro_sync.c +++ b/src/main/drivers/gyro_sync.c @@ -19,7 +19,8 @@ #include #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #include "common/axis.h" #include "common/maths.h" @@ -28,7 +29,8 @@ #include "drivers/accgyro.h" #include "drivers/gyro_sync.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" + #include "config/config.h" extern gyro_t gyro; diff --git a/src/main/drivers/light_ws2811strip.c b/src/main/drivers/light_ws2811strip.c index d9c29af370..8d41d681b2 100644 --- a/src/main/drivers/light_ws2811strip.c +++ b/src/main/drivers/light_ws2811strip.c @@ -32,7 +32,8 @@ #ifdef LED_STRIP -#include "build_config.h" +#include "build/build_config.h" + #include "common/color.h" #include "common/colorconversion.h" diff --git a/src/main/drivers/pwm_rx.c b/src/main/drivers/pwm_rx.c index c3bb4cf6c6..abcfbd9abc 100644 --- a/src/main/drivers/pwm_rx.c +++ b/src/main/drivers/pwm_rx.c @@ -22,8 +22,10 @@ #ifndef SKIP_RX_PWM_PPM -#include "build_config.h" -#include "debug.h" +#include "build/build_config.h" + +#include "build/debug.h" + #include "common/utils.h" diff --git a/src/main/drivers/rx_nrf24l01.c b/src/main/drivers/rx_nrf24l01.c index 321f2cebbe..cf7c01ef6e 100644 --- a/src/main/drivers/rx_nrf24l01.c +++ b/src/main/drivers/rx_nrf24l01.c @@ -26,7 +26,8 @@ #ifdef USE_RX_NRF24 -#include "build_config.h" +#include "build/build_config.h" + #include "system.h" #include "gpio.h" #include "io.h" diff --git a/src/main/drivers/serial_softserial.c b/src/main/drivers/serial_softserial.c index d8fafdf78e..b330a37305 100644 --- a/src/main/drivers/serial_softserial.c +++ b/src/main/drivers/serial_softserial.c @@ -22,10 +22,11 @@ #if defined(USE_SOFTSERIAL1) || defined(USE_SOFTSERIAL2) -#include "build_config.h" +#include "build/build_config.h" + +#include "build/atomic.h" #include "common/utils.h" -#include "common/atomic.h" #include "nvic.h" #include "system.h" diff --git a/src/main/drivers/serial_uart.c b/src/main/drivers/serial_uart.c index 4663701179..5456f00327 100644 --- a/src/main/drivers/serial_uart.c +++ b/src/main/drivers/serial_uart.c @@ -25,7 +25,8 @@ #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #include "common/utils.h" #include "gpio.h" diff --git a/src/main/drivers/serial_usb_vcp.c b/src/main/drivers/serial_usb_vcp.c index 50c6055ddd..81d71a7ed3 100644 --- a/src/main/drivers/serial_usb_vcp.c +++ b/src/main/drivers/serial_usb_vcp.c @@ -20,7 +20,8 @@ #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #include "common/utils.h" #include "io.h" diff --git a/src/main/drivers/sonar_hcsr04.c b/src/main/drivers/sonar_hcsr04.c index 2efe401787..bc5a66da6b 100644 --- a/src/main/drivers/sonar_hcsr04.c +++ b/src/main/drivers/sonar_hcsr04.c @@ -22,7 +22,8 @@ #if defined(SONAR) -#include "build_config.h" +#include "build/build_config.h" + #include "system.h" #include "exti.h" diff --git a/src/main/drivers/sonar_srf10.c b/src/main/drivers/sonar_srf10.c index 48def79507..a60554bedd 100644 --- a/src/main/drivers/sonar_srf10.c +++ b/src/main/drivers/sonar_srf10.c @@ -22,7 +22,8 @@ #if defined(SONAR) && defined(USE_SONAR_SRF10) -#include "build_config.h" +#include "build/build_config.h" + #include "drivers/system.h" #include "drivers/bus_i2c.h" diff --git a/src/main/drivers/sound_beeper_stm32f10x.c b/src/main/drivers/sound_beeper_stm32f10x.c index 3bf051738b..3c96b16013 100644 --- a/src/main/drivers/sound_beeper_stm32f10x.c +++ b/src/main/drivers/sound_beeper_stm32f10x.c @@ -21,7 +21,8 @@ #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #include "system.h" #include "gpio.h" diff --git a/src/main/drivers/sound_beeper_stm32f30x.c b/src/main/drivers/sound_beeper_stm32f30x.c index d1c81b6d62..0df1523af4 100644 --- a/src/main/drivers/sound_beeper_stm32f30x.c +++ b/src/main/drivers/sound_beeper_stm32f30x.c @@ -21,7 +21,8 @@ #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #include "gpio.h" diff --git a/src/main/drivers/timer.c b/src/main/drivers/timer.c index 5051588c99..6ab84f5e13 100755 --- a/src/main/drivers/timer.c +++ b/src/main/drivers/timer.c @@ -20,11 +20,12 @@ #include #include "platform.h" + +#include "build/atomic.h" + #include "common/utils.h" -#include "common/atomic.h" #include "nvic.h" - #include "io.h" #include "rcc.h" #include "system.h" diff --git a/src/main/mw.c b/src/main/fc/mw.c similarity index 99% rename from src/main/mw.c rename to src/main/fc/mw.c index c7fc76ecb5..b941b7f872 100755 --- a/src/main/mw.c +++ b/src/main/fc/mw.c @@ -21,7 +21,8 @@ #include #include "platform.h" -#include "debug.h" + +#include "build/debug.h" #include "scheduler/scheduler.h" #include "scheduler/scheduler_tasks.h" @@ -53,11 +54,13 @@ #include "sensors/gyro.h" #include "sensors/battery.h" +#include "fc/rc_controls.h" +#include "fc/rc_curves.h" +#include "fc/runtime_config.h" + #include "io/beeper.h" #include "io/display.h" #include "io/escservo.h" -#include "io/rc_controls.h" -#include "io/rc_curves.h" #include "io/gimbal.h" #include "io/gps.h" #include "io/ledstrip.h" @@ -80,7 +83,6 @@ #include "flight/failsafe.h" #include "flight/navigation_rewrite.h" -#include "config/runtime_config.h" #include "config/config.h" #include "config/config_profile.h" #include "config/config_master.h" diff --git a/src/main/mw.h b/src/main/fc/mw.h similarity index 100% rename from src/main/mw.h rename to src/main/fc/mw.h diff --git a/src/main/io/rc_controls.c b/src/main/fc/rc_controls.c similarity index 99% rename from src/main/io/rc_controls.c rename to src/main/fc/rc_controls.c index 2e73fd40b6..300d9dd172 100644 --- a/src/main/io/rc_controls.c +++ b/src/main/fc/rc_controls.c @@ -23,7 +23,7 @@ #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" #include "common/axis.h" #include "common/maths.h" @@ -43,8 +43,10 @@ #include "io/gps.h" #include "io/beeper.h" #include "io/escservo.h" -#include "io/rc_controls.h" -#include "io/rc_curves.h" + +#include "fc/rc_controls.h" +#include "fc/rc_curves.h" +#include "fc/runtime_config.h" #include "io/display.h" @@ -53,7 +55,6 @@ #include "flight/failsafe.h" #include "config/config.h" -#include "config/runtime_config.h" #include "blackbox/blackbox.h" diff --git a/src/main/io/rc_controls.h b/src/main/fc/rc_controls.h similarity index 100% rename from src/main/io/rc_controls.h rename to src/main/fc/rc_controls.h diff --git a/src/main/io/rc_curves.c b/src/main/fc/rc_curves.c similarity index 97% rename from src/main/io/rc_curves.c rename to src/main/fc/rc_curves.c index ca94500387..fcf17238df 100644 --- a/src/main/io/rc_curves.c +++ b/src/main/fc/rc_curves.c @@ -19,10 +19,10 @@ #include #include "rx/rx.h" -#include "io/rc_controls.h" +#include "fc/rc_controls.h" +#include "fc/rc_curves.h" #include "io/escservo.h" -#include "io/rc_curves.h" #define PITCH_LOOKUP_LENGTH 7 #define YAW_LOOKUP_LENGTH 7 diff --git a/src/main/io/rc_curves.h b/src/main/fc/rc_curves.h similarity index 82% rename from src/main/io/rc_curves.h rename to src/main/fc/rc_curves.h index ac81519a85..1cc9ea8822 100644 --- a/src/main/io/rc_curves.h +++ b/src/main/fc/rc_curves.h @@ -17,7 +17,9 @@ #pragma once -void generateThrottleCurve(controlRateConfig_t *controlRateConfig, escAndServoConfig_t *escAndServoConfig); +struct controlRateConfig_s; +struct escAndServoConfig_s; +void generateThrottleCurve(struct controlRateConfig_s *controlRateConfig, struct escAndServoConfig_s *escAndServoConfig); int16_t rcLookup(int32_t stickDeflection, uint8_t expo); int16_t rcLookupThrottle(int32_t tmp); diff --git a/src/main/config/runtime_config.c b/src/main/fc/runtime_config.c similarity index 98% rename from src/main/config/runtime_config.c rename to src/main/fc/runtime_config.c index 90304c975c..973371469e 100644 --- a/src/main/config/runtime_config.c +++ b/src/main/fc/runtime_config.c @@ -18,7 +18,7 @@ #include #include -#include "config/runtime_config.h" +#include "fc/runtime_config.h" #include "io/beeper.h" uint8_t armingFlags = 0; diff --git a/src/main/config/runtime_config.h b/src/main/fc/runtime_config.h similarity index 100% rename from src/main/config/runtime_config.h rename to src/main/fc/runtime_config.h diff --git a/src/main/flight/failsafe.c b/src/main/flight/failsafe.c index bfdcd4e7d4..ef265b1663 100644 --- a/src/main/flight/failsafe.c +++ b/src/main/flight/failsafe.c @@ -20,9 +20,11 @@ #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + + +#include "build/debug.h" -#include "debug.h" #include "common/axis.h" @@ -30,8 +32,10 @@ #include "drivers/system.h" #include "io/beeper.h" #include "io/escservo.h" -#include "io/rc_controls.h" -#include "config/runtime_config.h" +#include "fc/rc_controls.h" + +#include "fc/runtime_config.h" + #include "config/config.h" #include "flight/failsafe.h" diff --git a/src/main/flight/hil.c b/src/main/flight/hil.c index ba5270c265..32be517a5b 100644 --- a/src/main/flight/hil.c +++ b/src/main/flight/hil.c @@ -21,9 +21,11 @@ #include #include -#include "build_config.h" +#include "build/build_config.h" + #include "platform.h" -#include "debug.h" +#include "build/debug.h" + #include "common/axis.h" #include "common/maths.h" @@ -43,7 +45,8 @@ #include "flight/navigation_rewrite.h" #include "flight/navigation_rewrite_private.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" + #include "config/config.h" #ifdef HIL diff --git a/src/main/flight/imu.c b/src/main/flight/imu.c index db8f3d1cfe..13a1ddef83 100644 --- a/src/main/flight/imu.c +++ b/src/main/flight/imu.c @@ -23,10 +23,13 @@ #include "common/maths.h" -#include "build_config.h" +#include "build/build_config.h" + #include "platform.h" -#include "debug.h" -#include "build_config.h" +#include "build/debug.h" + +#include "build/build_config.h" + #include "common/axis.h" #include "common/filter.h" @@ -48,7 +51,8 @@ #include "flight/hil.h" #include "io/gps.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" + #include "config/config.h" /** diff --git a/src/main/flight/mixer.c b/src/main/flight/mixer.c index da912ef1f1..734e18d731 100755 --- a/src/main/flight/mixer.c +++ b/src/main/flight/mixer.c @@ -21,9 +21,11 @@ #include #include "platform.h" -#include "debug.h" +#include "build/debug.h" + + +#include "build/build_config.h" -#include "build_config.h" #include "common/axis.h" #include "common/maths.h" @@ -40,7 +42,8 @@ #include "io/gimbal.h" #include "io/escservo.h" -#include "io/rc_controls.h" +#include "fc/rc_controls.h" + #include "sensors/sensors.h" #include "sensors/acceleration.h" @@ -51,7 +54,8 @@ #include "flight/imu.h" #include "flight/navigation_rewrite.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" + #include "config/config.h" #include "config/config_profile.h" diff --git a/src/main/flight/navigation_rewrite.c b/src/main/flight/navigation_rewrite.c index a0641f523a..dc4a8780b2 100755 --- a/src/main/flight/navigation_rewrite.c +++ b/src/main/flight/navigation_rewrite.c @@ -19,9 +19,11 @@ #include #include -#include "build_config.h" + #include "platform.h" -#include "debug.h" + +#include "build/build_config.h" +#include "build/debug.h" #include "common/axis.h" #include "common/maths.h" @@ -43,7 +45,7 @@ #include "flight/navigation_rewrite.h" #include "flight/navigation_rewrite_private.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" #include "config/config.h" /*----------------------------------------------------------- diff --git a/src/main/flight/navigation_rewrite.h b/src/main/flight/navigation_rewrite.h index 2480f62f8c..0c5a1f2c27 100755 --- a/src/main/flight/navigation_rewrite.h +++ b/src/main/flight/navigation_rewrite.h @@ -20,7 +20,7 @@ #include "common/maths.h" #include "common/filter.h" -#include "io/rc_controls.h" +#include "fc/rc_controls.h" #include "io/escservo.h" #include "io/gps.h" diff --git a/src/main/flight/navigation_rewrite_fixedwing.c b/src/main/flight/navigation_rewrite_fixedwing.c index e5f4284a04..8c0a520920 100755 --- a/src/main/flight/navigation_rewrite_fixedwing.c +++ b/src/main/flight/navigation_rewrite_fixedwing.c @@ -19,12 +19,12 @@ #include #include -#include "build_config.h" #include "platform.h" #if defined(NAV) -#include "debug.h" +#include "build/build_config.h" +#include "build/debug.h" #include "common/axis.h" #include "common/maths.h" @@ -43,7 +43,7 @@ #include "flight/navigation_rewrite.h" #include "flight/navigation_rewrite_private.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" #include "config/config.h" // If we are going slower than NAV_FW_MIN_VEL_SPEED_BOOST - boost throttle to fight against the wind diff --git a/src/main/flight/navigation_rewrite_geo.c b/src/main/flight/navigation_rewrite_geo.c index 529d09ddd7..28099b17c9 100755 --- a/src/main/flight/navigation_rewrite_geo.c +++ b/src/main/flight/navigation_rewrite_geo.c @@ -19,12 +19,12 @@ #include #include -#include "build_config.h" #include "platform.h" #if defined(NAV) -#include "debug.h" +#include "build/build_config.h" +#include "build/debug.h" #include "common/axis.h" #include "common/maths.h" @@ -42,7 +42,7 @@ #include "flight/navigation_rewrite.h" #include "flight/navigation_rewrite_private.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" #include "config/config.h" #if defined(NAV_AUTO_MAG_DECLINATION) diff --git a/src/main/flight/navigation_rewrite_multicopter.c b/src/main/flight/navigation_rewrite_multicopter.c index 53ac5c41fa..6dee166eee 100755 --- a/src/main/flight/navigation_rewrite_multicopter.c +++ b/src/main/flight/navigation_rewrite_multicopter.c @@ -19,12 +19,12 @@ #include #include -#include "build_config.h" #include "platform.h" #if defined(NAV) -#include "debug.h" +#include "build/build_config.h" +#include "build/debug.h" #include "common/axis.h" #include "common/maths.h" @@ -39,8 +39,10 @@ #include "sensors/boardalignment.h" #include "io/escservo.h" -#include "io/rc_controls.h" -#include "io/rc_curves.h" + +#include "fc/rc_controls.h" +#include "fc/rc_curves.h" +#include "fc/runtime_config.h" #include "flight/pid.h" #include "flight/imu.h" @@ -48,7 +50,6 @@ #include "flight/navigation_rewrite_private.h" #include "flight/failsafe.h" -#include "config/runtime_config.h" #include "config/config.h" /*----------------------------------------------------------- diff --git a/src/main/flight/navigation_rewrite_pos_estimator.c b/src/main/flight/navigation_rewrite_pos_estimator.c index a1fcf0790e..433a1099cd 100755 --- a/src/main/flight/navigation_rewrite_pos_estimator.c +++ b/src/main/flight/navigation_rewrite_pos_estimator.c @@ -20,12 +20,12 @@ #include #include -#include "build_config.h" #include "platform.h" #if defined(NAV) -#include "debug.h" +#include "build/build_config.h" +#include "build/debug.h" #include "common/axis.h" #include "common/maths.h" @@ -47,7 +47,7 @@ #include "flight/navigation_rewrite.h" #include "flight/navigation_rewrite_private.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" #include "config/config.h" /** diff --git a/src/main/flight/navigation_rewrite_private.h b/src/main/flight/navigation_rewrite_private.h index 9f48c2fca9..b5284fd1bb 100755 --- a/src/main/flight/navigation_rewrite_private.h +++ b/src/main/flight/navigation_rewrite_private.h @@ -21,7 +21,7 @@ #if defined(NAV) -#include "config/runtime_config.h" +#include "fc/runtime_config.h" #define MIN_POSITION_UPDATE_RATE_HZ 5 // Minimum position update rate at which XYZ controllers would be applied #define NAV_THROTTLE_CUTOFF_FREQENCY_HZ 4 // low-pass filter on throttle output diff --git a/src/main/flight/pid.c b/src/main/flight/pid.c index 3c860d2501..b6a47af4f5 100644 --- a/src/main/flight/pid.c +++ b/src/main/flight/pid.c @@ -21,10 +21,13 @@ #include -#include "build_config.h" -#include "debug.h" +#include "build/build_config.h" + +#include "build/debug.h" + + +#include "fc/runtime_config.h" -#include "config/runtime_config.h" #include "common/axis.h" #include "common/maths.h" @@ -40,7 +43,8 @@ #include "rx/rx.h" -#include "io/rc_controls.h" +#include "fc/rc_controls.h" + #include "io/gps.h" #include "flight/pid.h" diff --git a/src/main/flight/pid.h b/src/main/flight/pid.h index c236e0c3c6..15c1c454f2 100644 --- a/src/main/flight/pid.h +++ b/src/main/flight/pid.h @@ -17,12 +17,6 @@ #pragma once -#include "rx/rx.h" - -#include "io/rc_controls.h" - -#include "config/runtime_config.h" - #define GYRO_SATURATION_LIMIT 1800 // 1800dps #define PID_MAX_OUTPUT 1000 #define YAW_P_LIMIT_MIN 100 // Maximum value for yaw P limiter @@ -78,8 +72,10 @@ extern int32_t axisPID_P[], axisPID_I[], axisPID_D[], axisPID_Setpoint[]; void pidInit(void); void pidResetErrorAccumulators(void); -void updatePIDCoefficients(const pidProfile_t *pidProfile, const controlRateConfig_t *controlRateConfig, const rxConfig_t *rxConfig); -void pidController(const pidProfile_t *pidProfile, const controlRateConfig_t *controlRateConfig, const rxConfig_t *rxConfig); +struct controlRateConfig_s; +struct rxConfig_s; +void updatePIDCoefficients(const pidProfile_t *pidProfile, const struct controlRateConfig_s *controlRateConfig, const struct rxConfig_s *rxConfig); +void pidController(const pidProfile_t *pidProfile, const struct controlRateConfig_s *controlRateConfig, const struct rxConfig_s *rxConfig); float pidRateToRcCommand(float rateDPS, uint8_t rate); int16_t pidAngleToRcCommand(float angleDeciDegrees, int16_t maxInclination); diff --git a/src/main/io/beeper.c b/src/main/io/beeper.c index 87d9896092..639a92254c 100644 --- a/src/main/io/beeper.c +++ b/src/main/io/beeper.c @@ -20,7 +20,8 @@ #include "stdlib.h" #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #include "drivers/gpio.h" #include "drivers/sound_beeper.h" @@ -29,14 +30,16 @@ #include "sensors/sensors.h" #include "rx/rx.h" -#include "io/rc_controls.h" +#include "fc/rc_controls.h" + #include "io/statusindicator.h" #ifdef GPS #include "io/gps.h" #endif -#include "config/runtime_config.h" +#include "fc/runtime_config.h" + #include "config/config.h" #include "io/beeper.h" diff --git a/src/main/io/display.c b/src/main/io/display.c index 63842df722..9f7aed502c 100644 --- a/src/main/io/display.c +++ b/src/main/io/display.c @@ -21,9 +21,11 @@ #include #include "platform.h" -#include "version.h" -#include "build_config.h" +#ifdef DISPLAY + +#include "build/version.h" +#include "build/build_config.h" #include "drivers/serial.h" #include "drivers/system.h" @@ -37,8 +39,6 @@ #include "common/axis.h" #include "common/typeconversion.h" -#ifdef DISPLAY - #include "sensors/battery.h" #include "sensors/sensors.h" #include "sensors/compass.h" @@ -48,7 +48,8 @@ #include "rx/rx.h" -#include "io/rc_controls.h" +#include "fc/rc_controls.h" + #include "flight/pid.h" #include "flight/imu.h" @@ -59,7 +60,8 @@ #include "flight/navigation_rewrite.h" #endif -#include "config/runtime_config.h" +#include "fc/runtime_config.h" + #include "config/config.h" diff --git a/src/main/io/gps.c b/src/main/io/gps.c index ae8939c003..284a196989 100755 --- a/src/main/io/gps.c +++ b/src/main/io/gps.c @@ -21,11 +21,13 @@ #include #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #ifdef GPS -#include "debug.h" +#include "build/debug.h" + #include "common/maths.h" #include "common/axis.h" @@ -50,7 +52,7 @@ #include "flight/navigation_rewrite.h" #include "config/config.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" // GPS timeout for wrong baud rate/disconnection/etc in milliseconds (default 2000 ms) #define GPS_TIMEOUT (2000) diff --git a/src/main/io/gps_i2cnav.c b/src/main/io/gps_i2cnav.c index c5c126eab4..8aa28c925a 100755 --- a/src/main/io/gps_i2cnav.c +++ b/src/main/io/gps_i2cnav.c @@ -20,11 +20,11 @@ #include #include "platform.h" -#include "build_config.h" #if defined(GPS) && defined(GPS_PROTO_I2C_NAV) -#include "debug.h" +#include "build/build_config.h" +#include "build/debug.h" #include "common/maths.h" #include "common/axis.h" @@ -44,7 +44,7 @@ #include "flight/navigation_rewrite.h" #include "config/config.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" #define GPS_I2C_POLL_RATE_HZ 20 // Poll I2C GPS at this rate diff --git a/src/main/io/gps_naza.c b/src/main/io/gps_naza.c index 29d89829f2..370864888b 100644 --- a/src/main/io/gps_naza.c +++ b/src/main/io/gps_naza.c @@ -22,11 +22,13 @@ #include #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #if defined(GPS) && defined(GPS_PROTO_NAZA) -#include "debug.h" +#include "build/debug.h" + #include "common/maths.h" #include "common/axis.h" @@ -43,7 +45,8 @@ #include "flight/gps_conversion.h" #include "config/config.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" + #define NAZA_MAX_PAYLOAD_SIZE 256 diff --git a/src/main/io/gps_nmea.c b/src/main/io/gps_nmea.c index e0ca342272..30bcdb4ca6 100755 --- a/src/main/io/gps_nmea.c +++ b/src/main/io/gps_nmea.c @@ -22,11 +22,13 @@ #include #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #if defined(GPS) && defined(GPS_PROTO_NMEA) -#include "debug.h" +#include "build/debug.h" + #include "common/maths.h" #include "common/axis.h" @@ -43,7 +45,7 @@ #include "flight/gps_conversion.h" #include "config/config.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" /* This is a light implementation of a GPS frame decoding This should work with most of modern GPS devices configured to output 5 frames. diff --git a/src/main/io/gps_ublox.c b/src/main/io/gps_ublox.c index 8fe6262a0e..d4a5e8c31e 100755 --- a/src/main/io/gps_ublox.c +++ b/src/main/io/gps_ublox.c @@ -23,11 +23,13 @@ #include #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #if defined(GPS) && defined(GPS_PROTO_UBLOX) -#include "debug.h" +#include "build/debug.h" + #include "common/maths.h" #include "common/axis.h" @@ -44,7 +46,7 @@ #include "flight/gps_conversion.h" #include "config/config.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" //#define GPS_PROTO_UBLOX_NEO7PLUS #define GPS_VERSION_DETECTION_TIMEOUT_MS 300 diff --git a/src/main/io/ledstrip.c b/src/main/io/ledstrip.c index 8b6f757bc2..ca64dc5dd0 100644 --- a/src/main/io/ledstrip.c +++ b/src/main/io/ledstrip.c @@ -23,13 +23,13 @@ #include -#include - #ifdef LED_STRIP -#include -#include -#include +#include "build/build_config.h" + +#include "common/color.h" +#include "common/maths.h" +#include "common/typeconversion.h" #include "drivers/light_ws2811strip.h" #include "drivers/system.h" @@ -44,7 +44,8 @@ #include "common/axis.h" #include "common/utils.h" -#include "io/rc_controls.h" +#include "fc/rc_controls.h" + #include "sensors/battery.h" #include "sensors/sensors.h" @@ -70,7 +71,8 @@ #include "telemetry/telemetry.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" + #include "config/config.h" #include "config/config_profile.h" #include "config/config_master.h" diff --git a/src/main/io/serial.c b/src/main/io/serial.c index 86944769c0..70db726d08 100644 --- a/src/main/io/serial.c +++ b/src/main/io/serial.c @@ -21,7 +21,8 @@ #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #include "common/utils.h" diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c index cfe78a0a8d..4d21eac84c 100644 --- a/src/main/io/serial_cli.c +++ b/src/main/io/serial_cli.c @@ -24,12 +24,12 @@ #include #include "platform.h" -#include "version.h" + +#include "build/version.h" +#include "build/build_config.h" #include "scheduler/scheduler.h" -#include "build_config.h" - #include "common/axis.h" #include "common/maths.h" #include "common/color.h" @@ -55,7 +55,8 @@ #include "io/escservo.h" #include "io/gps.h" #include "io/gimbal.h" -#include "io/rc_controls.h" +#include "fc/rc_controls.h" + #include "io/serial.h" #include "io/ledstrip.h" #include "io/flashfs.h" @@ -82,7 +83,8 @@ #include "telemetry/telemetry.h" #include "telemetry/frsky.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" + #include "config/config.h" #include "config/config_profile.h" #include "config/config_master.h" diff --git a/src/main/io/serial_msp.c b/src/main/io/serial_msp.c index 7022b1ccdd..6a3b4b9fce 100644 --- a/src/main/io/serial_msp.c +++ b/src/main/io/serial_msp.c @@ -21,10 +21,12 @@ #include #include -#include "build_config.h" -#include "debug.h" #include "platform.h" +#include "build/build_config.h" +#include "build/debug.h" +#include "build/version.h" + #include "scheduler/scheduler.h" #include "common/axis.h" @@ -52,7 +54,8 @@ #include "blackbox/blackbox.h" #include "io/escservo.h" -#include "io/rc_controls.h" +#include "fc/rc_controls.h" + #include "io/gps.h" #include "io/gimbal.h" #include "io/serial.h" @@ -79,16 +82,15 @@ #include "flight/failsafe.h" #include "flight/navigation_rewrite.h" -#include "mw.h" +#include "fc/mw.h" +#include "fc/runtime_config.h" -#include "config/runtime_config.h" #include "config/config.h" #include "config/config_profile.h" #include "config/config_master.h" #include "blackbox/blackbox.h" -#include "version.h" #ifdef NAZE #include "hardware_revision.h" #endif diff --git a/src/main/main.c b/src/main/main.c index 1e43815448..c3d20647c4 100644 --- a/src/main/main.c +++ b/src/main/main.c @@ -21,9 +21,12 @@ #include "platform.h" +#include "build/atomic.h" +#include "build/build_config.h" +#include "build/debug.h" + #include "common/axis.h" #include "common/color.h" -#include "common/atomic.h" #include "common/maths.h" #include "common/printf.h" @@ -65,7 +68,8 @@ #include "io/flashfs.h" #include "io/gps.h" #include "io/escservo.h" -#include "io/rc_controls.h" +#include "fc/rc_controls.h" + #include "io/gimbal.h" #include "io/ledstrip.h" #include "io/display.h" @@ -94,7 +98,8 @@ #include "flight/failsafe.h" #include "flight/navigation_rewrite.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" + #include "config/config.h" #include "config/config_profile.h" #include "config/config_master.h" @@ -103,8 +108,6 @@ #include "hardware_revision.h" #endif -#include "build_config.h" -#include "debug.h" extern uint8_t motorControlEnable; diff --git a/src/main/rx/ibus.c b/src/main/rx/ibus.c index 4c4801e74b..fab05bce6c 100755 --- a/src/main/rx/ibus.c +++ b/src/main/rx/ibus.c @@ -27,7 +27,8 @@ #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #include "drivers/system.h" diff --git a/src/main/rx/jetiexbus.c b/src/main/rx/jetiexbus.c index 2836d5ebca..b5b59814c3 100644 --- a/src/main/rx/jetiexbus.c +++ b/src/main/rx/jetiexbus.c @@ -40,7 +40,8 @@ #include "platform.h" #include "common/utils.h" -#include "build_config.h" +#include "build/build_config.h" + #include "drivers/system.h" #include "drivers/serial.h" #include "drivers/serial_uart.h" @@ -61,7 +62,8 @@ #endif //TELEMETRY -#include "debug.h" +#include "build/debug.h" + #include "rx/rx.h" // diff --git a/src/main/rx/msp.c b/src/main/rx/msp.c index ce5ff2becd..66ad3f85f4 100644 --- a/src/main/rx/msp.c +++ b/src/main/rx/msp.c @@ -20,7 +20,8 @@ #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #ifndef SKIP_RX_MSP diff --git a/src/main/rx/nrf24.c b/src/main/rx/nrf24.c index 66f0f35ff0..b6a23ebabc 100644 --- a/src/main/rx/nrf24.c +++ b/src/main/rx/nrf24.c @@ -22,7 +22,8 @@ #ifdef USE_RX_NRF24 -#include "build_config.h" +#include "build/build_config.h" + #include "drivers/rx_nrf24l01.h" #include "rx/rx.h" #include "rx/nrf24.h" diff --git a/src/main/rx/nrf24_cx10.c b/src/main/rx/nrf24_cx10.c index 592e1a13fc..e37609a976 100644 --- a/src/main/rx/nrf24_cx10.c +++ b/src/main/rx/nrf24_cx10.c @@ -23,7 +23,8 @@ #include #include -#include "build_config.h" +#include "build/build_config.h" + #ifdef USE_RX_CX10 diff --git a/src/main/rx/nrf24_h8_3d.c b/src/main/rx/nrf24_h8_3d.c index 183b6bdea9..80dab7efa5 100644 --- a/src/main/rx/nrf24_h8_3d.c +++ b/src/main/rx/nrf24_h8_3d.c @@ -26,7 +26,8 @@ #ifdef USE_RX_H8_3D -#include "build_config.h" +#include "build/build_config.h" + #include "drivers/rx_nrf24l01.h" #include "drivers/rx_xn297.h" diff --git a/src/main/rx/nrf24_syma.c b/src/main/rx/nrf24_syma.c index 90aee3d8ba..0b73b43a50 100644 --- a/src/main/rx/nrf24_syma.c +++ b/src/main/rx/nrf24_syma.c @@ -23,7 +23,8 @@ #include #include -#include "build_config.h" +#include "build/build_config.h" + #ifdef USE_RX_SYMA diff --git a/src/main/rx/nrf24_v202.c b/src/main/rx/nrf24_v202.c index ac2c8d3bfa..01ccd0619a 100644 --- a/src/main/rx/nrf24_v202.c +++ b/src/main/rx/nrf24_v202.c @@ -23,7 +23,8 @@ #include #include -#include "build_config.h" +#include "build/build_config.h" + #ifdef USE_RX_V202 diff --git a/src/main/rx/pwm.c b/src/main/rx/pwm.c index 2925a4e453..900d017372 100644 --- a/src/main/rx/pwm.c +++ b/src/main/rx/pwm.c @@ -21,7 +21,8 @@ #include -#include "build_config.h" +#include "build/build_config.h" + #include "platform.h" diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c index 13785c52fb..9a0ef4cd22 100644 --- a/src/main/rx/rx.c +++ b/src/main/rx/rx.c @@ -22,8 +22,10 @@ #include #include "platform.h" -#include "build_config.h" -#include "debug.h" +#include "build/build_config.h" + +#include "build/debug.h" + #include "common/maths.h" @@ -34,7 +36,8 @@ #include "drivers/adc.h" #include "io/serial.h" -#include "io/rc_controls.h" +#include "fc/rc_controls.h" + #include "flight/failsafe.h" diff --git a/src/main/rx/sbus.c b/src/main/rx/sbus.c index 6c0f5a7d97..c86c81d09f 100644 --- a/src/main/rx/sbus.c +++ b/src/main/rx/sbus.c @@ -21,7 +21,8 @@ #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #include "drivers/system.h" diff --git a/src/main/rx/spektrum.c b/src/main/rx/spektrum.c index e18f1beb56..b8152c28f5 100644 --- a/src/main/rx/spektrum.c +++ b/src/main/rx/spektrum.c @@ -20,7 +20,8 @@ #include #include "platform.h" -#include "debug.h" +#include "build/debug.h" + #include "drivers/io.h" #include "drivers/io_impl.h" diff --git a/src/main/rx/sumd.c b/src/main/rx/sumd.c index 5b8fe1e902..82a8da55f9 100644 --- a/src/main/rx/sumd.c +++ b/src/main/rx/sumd.c @@ -21,7 +21,8 @@ #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #include "drivers/system.h" diff --git a/src/main/rx/sumh.c b/src/main/rx/sumh.c index 6950b5d90b..9701597d35 100644 --- a/src/main/rx/sumh.c +++ b/src/main/rx/sumh.c @@ -27,7 +27,8 @@ #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #include "drivers/system.h" diff --git a/src/main/scheduler/scheduler.c b/src/main/scheduler/scheduler.c index 13f665800f..8e3ec27c44 100755 --- a/src/main/scheduler/scheduler.c +++ b/src/main/scheduler/scheduler.c @@ -25,8 +25,10 @@ typedef enum {TEST_IRQ = 0 } IRQn_Type; #include "platform.h" #include "scheduler.h" -#include "debug.h" -#include "build_config.h" +#include "build/debug.h" + +#include "build/build_config.h" + #include "common/maths.h" diff --git a/src/main/sensors/acceleration.c b/src/main/sensors/acceleration.c index ce414e10ba..4cad37cc39 100644 --- a/src/main/sensors/acceleration.c +++ b/src/main/sensors/acceleration.c @@ -33,7 +33,8 @@ #include "sensors/sensors.h" #include "io/beeper.h" #include "sensors/boardalignment.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" + #include "config/config.h" #include "sensors/acceleration.h" diff --git a/src/main/sensors/battery.c b/src/main/sensors/battery.c index c5dcc11d20..7a0950ca42 100644 --- a/src/main/sensors/battery.c +++ b/src/main/sensors/battery.c @@ -26,14 +26,16 @@ #include "drivers/adc.h" #include "drivers/system.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" + #include "config/config.h" #include "sensors/battery.h" #include "rx/rx.h" -#include "io/rc_controls.h" +#include "fc/rc_controls.h" + #include "io/beeper.h" #define VBATT_PRESENT_THRESHOLD_MV 10 diff --git a/src/main/sensors/compass.c b/src/main/sensors/compass.c index 860398c9b6..4ecb96425f 100644 --- a/src/main/sensors/compass.c +++ b/src/main/sensors/compass.c @@ -31,7 +31,8 @@ #include "drivers/light_led.h" #include "sensors/boardalignment.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" + #include "config/config.h" #include "sensors/sensors.h" diff --git a/src/main/sensors/initialisation.c b/src/main/sensors/initialisation.c index 5475974837..971a797132 100755 --- a/src/main/sensors/initialisation.c +++ b/src/main/sensors/initialisation.c @@ -20,7 +20,8 @@ #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #include "common/axis.h" @@ -61,7 +62,8 @@ #include "drivers/sonar_hcsr04.h" #include "drivers/sonar_srf10.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" + #include "config/config.h" #include "sensors/sensors.h" diff --git a/src/main/sensors/rangefinder.c b/src/main/sensors/rangefinder.c index 576114dbe3..ecaa109f92 100644 --- a/src/main/sensors/rangefinder.c +++ b/src/main/sensors/rangefinder.c @@ -24,12 +24,14 @@ #ifdef SONAR -#include "build_config.h" +#include "build/build_config.h" + #include "common/maths.h" #include "config/config.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" + #include "drivers/io.h" #include "drivers/sonar_hcsr04.h" diff --git a/src/main/target/ALIENFLIGHTF3/hardware_revision.c b/src/main/target/ALIENFLIGHTF3/hardware_revision.c index a8f1ebdb7e..d34ccc305d 100644 --- a/src/main/target/ALIENFLIGHTF3/hardware_revision.c +++ b/src/main/target/ALIENFLIGHTF3/hardware_revision.c @@ -20,7 +20,8 @@ #include #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #include "drivers/system.h" #include "drivers/io.h" diff --git a/src/main/target/CJMCU/hardware_revision.c b/src/main/target/CJMCU/hardware_revision.c index 558e19a760..2402b85a1c 100755 --- a/src/main/target/CJMCU/hardware_revision.c +++ b/src/main/target/CJMCU/hardware_revision.c @@ -21,7 +21,8 @@ #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #include "drivers/system.h" #include "drivers/bus_spi.h" diff --git a/src/main/target/NAZE/hardware_revision.c b/src/main/target/NAZE/hardware_revision.c index 3e05f20632..f7e8c20b64 100755 --- a/src/main/target/NAZE/hardware_revision.c +++ b/src/main/target/NAZE/hardware_revision.c @@ -21,7 +21,8 @@ #include "platform.h" -#include "build_config.h" +#include "build/build_config.h" + #include "drivers/system.h" #include "drivers/bus_spi.h" diff --git a/src/main/telemetry/frsky.c b/src/main/telemetry/frsky.c index daf5280625..8e87f75440 100644 --- a/src/main/telemetry/frsky.c +++ b/src/main/telemetry/frsky.c @@ -45,7 +45,9 @@ #include "sensors/battery.h" #include "io/serial.h" -#include "io/rc_controls.h" +#include "fc/rc_controls.h" +#include "fc/runtime_config.h" + #include "io/gps.h" #include "rx/rx.h" diff --git a/src/main/telemetry/hott.c b/src/main/telemetry/hott.c index 5bfbcd9592..15524773f6 100644 --- a/src/main/telemetry/hott.c +++ b/src/main/telemetry/hott.c @@ -57,24 +57,29 @@ #include #include "platform.h" -#include "build_config.h" -#include "debug.h" + + #if defined(TELEMETRY) && defined(TELEMETRY_HOTT) +#include "build/build_config.h" +#include "build/debug.h" + #include "common/axis.h" #include "drivers/system.h" - #include "drivers/serial.h" + +#include "fc/runtime_config.h" + #include "io/serial.h" +#include "io/gps.h" #include "sensors/sensors.h" #include "sensors/battery.h" #include "flight/pid.h" #include "flight/navigation_rewrite.h" -#include "io/gps.h" #include "telemetry/telemetry.h" #include "telemetry/hott.h" diff --git a/src/main/telemetry/ltm.c b/src/main/telemetry/ltm.c index f074ec9682..146c3f1b6c 100644 --- a/src/main/telemetry/ltm.c +++ b/src/main/telemetry/ltm.c @@ -33,9 +33,11 @@ #include "platform.h" + + #if defined(TELEMETRY_LTM) -#include "build_config.h" +#include "build/build_config.h" #include "common/maths.h" #include "common/axis.h" @@ -59,7 +61,10 @@ #include "sensors/battery.h" #include "io/serial.h" -#include "io/rc_controls.h" + +#include "fc/rc_controls.h" +#include "fc/runtime_config.h" + #include "io/gimbal.h" #include "io/gps.h" #include "io/ledstrip.h" diff --git a/src/main/telemetry/mavlink.c b/src/main/telemetry/mavlink.c index b29fd6d13b..9a3fc7514b 100755 --- a/src/main/telemetry/mavlink.c +++ b/src/main/telemetry/mavlink.c @@ -26,10 +26,10 @@ #include "platform.h" -#include "build_config.h" - #if defined(TELEMETRY) && defined(TELEMETRY_MAVLINK) +#include "build/build_config.h" + #include "common/maths.h" #include "common/axis.h" #include "common/color.h" @@ -43,7 +43,8 @@ #include "drivers/pwm_rx.h" #include "io/serial.h" -#include "io/rc_controls.h" +#include "fc/rc_controls.h" + #include "io/gimbal.h" #include "io/gps.h" #include "io/ledstrip.h" @@ -69,11 +70,12 @@ #include "mavlink/common/mavlink.h" #include "config/config.h" -#include "config/runtime_config.h" +#include "fc/runtime_config.h" + #include "config/config_profile.h" #include "config/config_master.h" -#include "mw.h" +#include "fc/mw.h" // mavlink library uses unnames unions that's causes GCC to complain if -Wpedantic is used // until this is resolved in mavlink library - ignore -Wpedantic for mavlink code diff --git a/src/main/telemetry/smartport.c b/src/main/telemetry/smartport.c index 0100a0386a..30f3ac2af1 100644 --- a/src/main/telemetry/smartport.c +++ b/src/main/telemetry/smartport.c @@ -30,8 +30,10 @@ #include "rx/rx.h" #include "rx/msp.h" +#include "fc/rc_controls.h" +#include "fc/runtime_config.h" + #include "io/escservo.h" -#include "io/rc_controls.h" #include "io/gps.h" #include "io/gimbal.h" #include "io/serial.h" diff --git a/src/main/telemetry/telemetry.c b/src/main/telemetry/telemetry.c index 1dfc5a57dc..730398b5ad 100644 --- a/src/main/telemetry/telemetry.c +++ b/src/main/telemetry/telemetry.c @@ -32,9 +32,11 @@ #include "io/serial.h" #include "rx/rx.h" -#include "io/rc_controls.h" +#include "fc/rc_controls.h" + + +#include "fc/runtime_config.h" -#include "config/runtime_config.h" #include "config/config.h" #include "telemetry/telemetry.h" diff --git a/src/main/vcp/hw_config.c b/src/main/vcp/hw_config.c index 7384b1e0b4..3270d1bf79 100644 --- a/src/main/vcp/hw_config.c +++ b/src/main/vcp/hw_config.c @@ -39,7 +39,8 @@ #include "drivers/system.h" #include "drivers/nvic.h" -#include "build_config.h" +#include "build/build_config.h" + /* Private typedef -----------------------------------------------------------*/