Moved 'config.[ch]' into the 'config/' directory.

make/source.mk

@@ -9,6 +9,7 @@ COMMON_SRC = \
             $(addprefix config/,$(notdir $(wildcard $(SRC_DIR)/config/*.c))) \
             cli/cli.c \
             cli/settings.c \
+            config/config.c \
             drivers/adc.c \
             drivers/dshot.c \
             drivers/dshot_dpwm.c \
@@ -47,7 +48,6 @@ COMMON_SRC = \
             drivers/transponder_ir_ilap.c \
             drivers/transponder_ir_erlt.c \
             fc/board_info.c \
-            fc/config.c \
             fc/dispatch.c \
             fc/hardfaults.c \
             fc/tasks.c \

src/main/blackbox/blackbox.c

@@ -52,7 +52,7 @@
 #include "drivers/sensor.h"
 #include "drivers/time.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/rc.h"
 #include "fc/rc_controls.h"

src/main/cli/cli.c

@@ -94,7 +94,7 @@ bool cliMode = false;
 #include "drivers/vtx_table.h"
 
 #include "fc/board_info.h"
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/core.h"
 #include "fc/rc.h"

src/main/cli/settings.c

@@ -43,7 +43,7 @@
 #include "drivers/vtx_common.h"
 #include "drivers/vtx_table.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/core.h"
 #include "fc/rc_adjustments.h"

src/main/cms/cms.c

@@ -59,7 +59,7 @@
 #include "pg/rx.h"
 
 // For 'ARM' related
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"
 

src/main/cms/cms_menu_blackbox.c

@@ -49,7 +49,7 @@
 #include "drivers/time.h"
 #include "drivers/sdcard.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "io/asyncfatfs/asyncfatfs.h"
 #include "io/flashfs.h"

src/main/cms/cms_menu_builtin.c

@@ -53,7 +53,7 @@
 
 #include "drivers/system.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "msp/msp_protocol.h" // XXX for FC identification... not available elsewhere
 

src/main/cms/cms_menu_failsafe.c

@@ -37,7 +37,7 @@
 
 #include "config/feature.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "flight/failsafe.h"
 

src/main/cms/cms_menu_gps_rescue.c

@@ -35,7 +35,7 @@
 
 #include "config/feature.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "flight/gps_rescue.h"
 

src/main/cms/cms_menu_imu.c

@@ -43,7 +43,7 @@
 
 #include "drivers/pwm_output.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/core.h"
 #include "fc/rc_controls.h"

src/main/cms/cms_menu_ledstrip.c

@@ -36,7 +36,7 @@
 
 #include "config/feature.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "io/ledstrip.h"
 

src/main/cms/cms_menu_misc.c

@@ -44,7 +44,7 @@
 #include "pg/motor.h"
 #include "pg/rx.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_controls.h"
 
 #include "flight/mixer.h"

src/main/cms/cms_menu_power.c

@@ -37,7 +37,7 @@
 #include "sensors/current.h"
 #include "sensors/voltage.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 voltageMeterSource_e batteryConfig_voltageMeterSource;
 currentMeterSource_e batteryConfig_currentMeterSource;

src/main/cms/cms_menu_saveexit.c

@@ -32,7 +32,7 @@
 
 #include "config/feature.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 static const OSD_Entry cmsx_menuSaveExitEntries[] =
 {

src/main/cms/cms_menu_vtx_rtc6705.c

@@ -35,7 +35,7 @@
 
 #include "drivers/vtx_common.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "io/vtx_rtc6705.h"
 #include "io/vtx.h"

src/main/cms/cms_menu_vtx_smartaudio.c

@@ -37,7 +37,7 @@
 
 #include "drivers/vtx_common.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "io/vtx_smartaudio.h"
 #include "io/vtx.h"

src/main/cms/cms_menu_vtx_tramp.c

@@ -36,7 +36,7 @@
 
 #include "drivers/vtx_common.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "io/vtx_tramp.h"
 #include "io/vtx.h"

src/main/fc/config.c → src/main/config/config.c

@@ -22,7 +22,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <math.h>
-#include <common/printf.h>
 
 #include "platform.h"
 
@@ -32,14 +31,15 @@
 
 #include "cli/cli.h"
 
+#include "common/sensor_alignment.h"
+
 #include "config/config_eeprom.h"
 #include "config/feature.h"
 
 #include "drivers/dshot_command.h"
 #include "drivers/motor.h"
 #include "drivers/system.h"
 
-#include "fc/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/core.h"
 #include "fc/rc.h"
@@ -65,9 +65,9 @@
 #include "pg/beeper.h"
 #include "pg/beeper_dev.h"
 #include "pg/gyrodev.h"
+#include "pg/motor.h"
 #include "pg/pg.h"
 #include "pg/pg_ids.h"
-#include "pg/motor.h"
 #include "pg/rx.h"
 #include "pg/vtx_table.h"
 
@@ -80,7 +80,7 @@
 #include "sensors/compass.h"
 #include "sensors/gyro.h"
 
-#include "common/sensor_alignment.h"
+#include "config.h"
 
 static bool configIsDirty; /* someone indicated that the config is modified and it is not yet saved */
 

src/main/config/config_eeprom.c

@@ -32,7 +32,7 @@
 #include "config/config_eeprom.h"
 #include "config/config_streamer.h"
 #include "pg/pg.h"
-#include "fc/config.h"
+#include "config/config.h"
 
 #ifdef CONFIG_IN_SDCARD
 #include "io/asyncfatfs/asyncfatfs.h"

src/main/drivers/serial_softserial.c

@@ -39,13 +39,11 @@
 
 #include "drivers/nvic.h"
 #include "drivers/io.h"
-#include "timer.h"
+#include "drivers/serial.h"
+#include "drivers/timer.h"
 
-#include "serial.h"
 #include "serial_softserial.h"
 
-#include "fc/config.h" //!!TODO remove this dependency
-
 #define RX_TOTAL_BITS 10
 #define TX_TOTAL_BITS 10
 

src/main/fc/controlrate_profile.c

@@ -30,7 +30,7 @@
 #include "pg/pg.h"
 #include "pg/pg_ids.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/rc.h"
 #include "fc/rc_controls.h"

src/main/fc/core.c

@@ -49,7 +49,7 @@
 #include "drivers/time.h"
 #include "drivers/transponder_ir.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/core.h"
 #include "fc/rc.h"

src/main/fc/init.c

@@ -83,7 +83,7 @@
 #include "drivers/vtx_table.h"
 
 #include "fc/board_info.h"
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/dispatch.h"
 #include "fc/init.h"
 #include "fc/rc_controls.h"

src/main/fc/rc.c

@@ -32,7 +32,7 @@
 
 #include "config/feature.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "drivers/time.h"
 #include "fc/core.h"

src/main/fc/rc_adjustments.c

@@ -39,7 +39,7 @@
 
 #include "drivers/time.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/rc_controls.h"
 #include "fc/rc.h"

src/main/fc/rc_controls.c

@@ -37,7 +37,7 @@
 
 #include "drivers/camera_control.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/core.h"
 #include "fc/rc.h"
 #include "fc/runtime_config.h"

src/main/fc/rc_modes.c

@@ -35,7 +35,7 @@
 #include "pg/pg_ids.h"
 #include "pg/rx.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_controls.h"
 
 #include "rx/rx.h"

src/main/fc/stats.c

@@ -24,7 +24,7 @@
 
 #include "drivers/time.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/dispatch.h"
 #include "fc/runtime_config.h"
 #include "fc/stats.h"

src/main/fc/tasks.c

@@ -46,7 +46,7 @@
 #include "drivers/usb_io.h"
 #include "drivers/vtx_common.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/core.h"
 #include "fc/rc.h"
 #include "fc/dispatch.h"

src/main/flight/failsafe.c

@@ -33,7 +33,7 @@
 
 #include "drivers/time.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/core.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_modes.h"

src/main/flight/gps_rescue.c

@@ -32,7 +32,7 @@
 
 #include "io/gps.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/core.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_modes.h"

src/main/flight/mixer.c

@@ -44,7 +44,7 @@
 
 #include "io/motors.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_modes.h"

src/main/flight/servos.c

@@ -40,7 +40,7 @@
 
 #include "drivers/pwm_output.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_modes.h"
 #include "fc/runtime_config.h"

src/main/io/beeper.c

@@ -36,7 +36,7 @@
 
 #include "flight/mixer.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/core.h"
 #include "fc/runtime_config.h"
 

src/main/io/dashboard.c

@@ -50,7 +50,7 @@
 #include "pg/dashboard.h"
 #include "pg/rx.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/rc_controls.h"
 #include "fc/runtime_config.h"

src/main/io/displayport_max7456.c

@@ -30,7 +30,7 @@
 #include "drivers/display.h"
 #include "drivers/max7456.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 
 #include "io/displayport_max7456.h"
 

src/main/io/gps.c

@@ -47,7 +47,7 @@
 #include "io/gps.h"
 #include "io/serial.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/runtime_config.h"
 
 #include "flight/imu.h"

src/main/io/ledstrip.c

@@ -48,7 +48,7 @@
 #include "drivers/time.h"
 #include "drivers/vtx_common.h"
 
-#include "fc/config.h"
+#include "config/config.h"
 #include "fc/core.h"
 #include "fc/rc_controls.h"
 #include "fc/rc_modes.h"