diff --git a/make/mcu/SITL.mk b/make/mcu/SITL.mk index 8ba66ff91e..bdbfb3d87a 100644 --- a/make/mcu/SITL.mk +++ b/make/mcu/SITL.mk @@ -7,7 +7,7 @@ MCU_COMMON_SRC := $(ROOT)/lib/main/dyad/dyad.c #Flags ARCH_FLAGS = DEVICE_FLAGS = -LD_SCRIPT = src/main/target/SITL/parameter_group.ld +LD_SCRIPT = src/main/target/SITL/pg.ld STARTUP_SRC = TARGET_FLAGS = -D$(TARGET) diff --git a/make/source.mk b/make/source.mk index a9e08a75dd..44cbef7e89 100644 --- a/make/source.mk +++ b/make/source.mk @@ -18,7 +18,6 @@ COMMON_SRC = \ common/typeconversion.c \ config/config_eeprom.c \ config/feature.c \ - config/parameter_group.c \ config/config_streamer.c \ drivers/adc.c \ drivers/buf_writer.c \ @@ -62,6 +61,7 @@ COMMON_SRC = \ io/transponder_ir.c \ msp/msp_serial.c \ pg/adc.c \ + pg/pg.c \ scheduler/scheduler.c \ sensors/battery.c \ sensors/current.c \ @@ -287,7 +287,6 @@ SIZE_OPTIMISED_SRC := $(SIZE_OPTIMISED_SRC) \ fc/fc_init.c \ config/config_eeprom.c \ config/feature.c \ - config/parameter_group.c \ config/config_streamer.c \ i2c_bst.c \ interface/cli.c \ @@ -314,7 +313,8 @@ SIZE_OPTIMISED_SRC := $(SIZE_OPTIMISED_SRC) \ io/vtx_rtc6705.c \ io/vtx_smartaudio.c \ io/vtx_tramp.c \ - io/vtx_control.c + io/vtx_control.c \ + pg/pg.h # F4 and F7 optimizations ifneq ($(TARGET),$(filter $(TARGET),$(F3_TARGETS))) diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c index 6a3b8a6969..d12fe43e49 100644 --- a/src/main/blackbox/blackbox.c +++ b/src/main/blackbox/blackbox.c @@ -40,8 +40,8 @@ #include "common/utils.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/compass/compass.h" #include "drivers/sensor.h" diff --git a/src/main/blackbox/blackbox.h b/src/main/blackbox/blackbox.h index 0b7f18d3eb..e5b96b03be 100644 --- a/src/main/blackbox/blackbox.h +++ b/src/main/blackbox/blackbox.h @@ -20,7 +20,7 @@ #include "platform.h" #include "build/build_config.h" #include "common/time.h" -#include "config/parameter_group.h" +#include "pg/pg.h" typedef enum BlackboxDevice { BLACKBOX_DEVICE_NONE = 0, diff --git a/src/main/cms/cms.c b/src/main/cms/cms.c index a409e07cdc..b1208d4746 100644 --- a/src/main/cms/cms.c +++ b/src/main/cms/cms.c @@ -49,8 +49,8 @@ // For rcData, stopAllMotors, stopPwmAllMotors #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" // For 'ARM' related #include "fc/config.h" diff --git a/src/main/cms/cms_menu_blackbox.c b/src/main/cms/cms_menu_blackbox.c index d06ab002d2..67b94cb480 100644 --- a/src/main/cms/cms_menu_blackbox.c +++ b/src/main/cms/cms_menu_blackbox.c @@ -41,8 +41,8 @@ #include "common/utils.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/time.h" diff --git a/src/main/cms/cms_menu_imu.c b/src/main/cms/cms_menu_imu.c index 681fb0c067..79d8826dc5 100644 --- a/src/main/cms/cms_menu_imu.c +++ b/src/main/cms/cms_menu_imu.c @@ -36,7 +36,7 @@ #include "common/utils.h" #include "config/feature.h" -#include "config/parameter_group.h" +#include "pg/pg.h" #include "fc/config.h" #include "fc/controlrate_profile.h" diff --git a/src/main/cms/cms_menu_ledstrip.c b/src/main/cms/cms_menu_ledstrip.c index bd3041f48d..7ac32f0278 100644 --- a/src/main/cms/cms_menu_ledstrip.c +++ b/src/main/cms/cms_menu_ledstrip.c @@ -31,8 +31,8 @@ #include "cms/cms_menu_ledstrip.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "fc/config.h" diff --git a/src/main/cms/cms_menu_misc.c b/src/main/cms/cms_menu_misc.c index 11569f65c2..dcd63ebe92 100644 --- a/src/main/cms/cms_menu_misc.c +++ b/src/main/cms/cms_menu_misc.c @@ -36,8 +36,8 @@ #include "common/utils.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "fc/config.h" #include "fc/rc_controls.h" diff --git a/src/main/cms/cms_menu_osd.c b/src/main/cms/cms_menu_osd.c index 04bece5fcd..2a70662b36 100644 --- a/src/main/cms/cms_menu_osd.c +++ b/src/main/cms/cms_menu_osd.c @@ -33,8 +33,8 @@ #include "common/utils.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "io/displayport_max7456.h" #include "io/osd.h" diff --git a/src/main/common/time.c b/src/main/common/time.c index fc4f66df65..5940c4225f 100644 --- a/src/main/common/time.c +++ b/src/main/common/time.c @@ -30,7 +30,7 @@ #include "common/printf.h" #include "common/time.h" -#include "config/parameter_group_ids.h" +#include "pg/pg_ids.h" #include "drivers/time.h" diff --git a/src/main/common/time.h b/src/main/common/time.h index feb70638d2..813e4a4f33 100644 --- a/src/main/common/time.h +++ b/src/main/common/time.h @@ -22,7 +22,7 @@ #include "platform.h" -#include "config/parameter_group.h" +#include "pg/pg.h" // time difference, 32 bits always sufficient typedef int32_t timeDelta_t; diff --git a/src/main/config/config_eeprom.c b/src/main/config/config_eeprom.c index 702e15eeb6..86ae1731c7 100644 --- a/src/main/config/config_eeprom.c +++ b/src/main/config/config_eeprom.c @@ -28,7 +28,7 @@ #include "config/config_eeprom.h" #include "config/config_streamer.h" -#include "config/parameter_group.h" +#include "pg/pg.h" #include "fc/config.h" #include "drivers/system.h" diff --git a/src/main/config/feature.c b/src/main/config/feature.c index 8ee9c4afef..b5a83fa803 100644 --- a/src/main/config/feature.c +++ b/src/main/config/feature.c @@ -22,8 +22,8 @@ #include "platform.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" static uint32_t activeFeaturesLatch = 0; diff --git a/src/main/config/feature.h b/src/main/config/feature.h index 2eb75f8a42..40bcd0ae4b 100644 --- a/src/main/config/feature.h +++ b/src/main/config/feature.h @@ -17,7 +17,7 @@ #pragma once -#include "config/parameter_group.h" +#include "pg/pg.h" typedef struct featureConfig_s { uint32_t enabledFeatures; diff --git a/src/main/drivers/bus_i2c.h b/src/main/drivers/bus_i2c.h index 3079cbcfc4..0e8383154e 100644 --- a/src/main/drivers/bus_i2c.h +++ b/src/main/drivers/bus_i2c.h @@ -19,7 +19,7 @@ #include "platform.h" -#include "config/parameter_group.h" +#include "pg/pg.h" #include "drivers/io_types.h" #include "drivers/rcc_types.h" diff --git a/src/main/drivers/bus_i2c_config.c b/src/main/drivers/bus_i2c_config.c index 7ef39f58a1..466bab7210 100644 --- a/src/main/drivers/bus_i2c_config.c +++ b/src/main/drivers/bus_i2c_config.c @@ -34,8 +34,8 @@ #include "drivers/bus_i2c.h" #include "drivers/bus_i2c_impl.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #ifdef I2C_FULL_RECONFIGURABILITY #if I2CDEV_COUNT >= 1 diff --git a/src/main/drivers/bus_spi_pinconfig.c b/src/main/drivers/bus_spi_pinconfig.c index 469f5dc39e..455bf10548 100644 --- a/src/main/drivers/bus_spi_pinconfig.c +++ b/src/main/drivers/bus_spi_pinconfig.c @@ -32,8 +32,8 @@ #include "drivers/io.h" #include "drivers/rcc.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" // Pin defaults for backward compatibility #ifndef SPI1_SCK_PIN diff --git a/src/main/drivers/camera_control.c b/src/main/drivers/camera_control.c index 3c5d637724..7c6ec70388 100644 --- a/src/main/drivers/camera_control.c +++ b/src/main/drivers/camera_control.c @@ -25,7 +25,7 @@ #include "nvic.h" #include "pwm_output.h" #include "time.h" -#include "config/parameter_group_ids.h" +#include "pg/pg_ids.h" #if defined(STM32F40_41xxx) #define CAMERA_CONTROL_TIMER_HZ MHZ_TO_HZ(84) diff --git a/src/main/drivers/camera_control.h b/src/main/drivers/camera_control.h index 031fb27aeb..b825900b8a 100644 --- a/src/main/drivers/camera_control.h +++ b/src/main/drivers/camera_control.h @@ -18,7 +18,7 @@ #pragma once #include "io_types.h" -#include "config/parameter_group.h" +#include "pg/pg.h" typedef enum { CAMERA_CONTROL_KEY_ENTER, diff --git a/src/main/drivers/inverter.c b/src/main/drivers/inverter.c index 268315d1f9..812fce5095 100644 --- a/src/main/drivers/inverter.c +++ b/src/main/drivers/inverter.c @@ -24,8 +24,8 @@ #include "drivers/io.h" #include "drivers/serial.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "inverter.h" diff --git a/src/main/drivers/light_led.c b/src/main/drivers/light_led.c index ea9d01a0d1..cb055a7e9a 100644 --- a/src/main/drivers/light_led.c +++ b/src/main/drivers/light_led.c @@ -17,7 +17,7 @@ #include "platform.h" -#include "config/parameter_group_ids.h" +#include "pg/pg_ids.h" #include "drivers/io.h" #include "io_impl.h" diff --git a/src/main/drivers/light_led.h b/src/main/drivers/light_led.h index 198a3f3244..6bf1fe3d3d 100644 --- a/src/main/drivers/light_led.h +++ b/src/main/drivers/light_led.h @@ -17,7 +17,7 @@ #pragma once -#include "config/parameter_group.h" +#include "pg/pg.h" #include "drivers/io_types.h" #include "common/utils.h" diff --git a/src/main/drivers/max7456.c b/src/main/drivers/max7456.c index c8bb4b2edf..b7fa267e22 100644 --- a/src/main/drivers/max7456.c +++ b/src/main/drivers/max7456.c @@ -25,8 +25,8 @@ #include "build/debug.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/bus_spi.h" #include "drivers/dma.h" diff --git a/src/main/drivers/serial.h b/src/main/drivers/serial.h index af8d93a948..38bfd8847d 100644 --- a/src/main/drivers/serial.h +++ b/src/main/drivers/serial.h @@ -18,7 +18,7 @@ #pragma once #include "drivers/io.h" -#include "config/parameter_group.h" +#include "pg/pg.h" typedef enum { MODE_RX = 1 << 0, diff --git a/src/main/drivers/serial_escserial.c b/src/main/drivers/serial_escserial.c index 84b1733152..854bd4ea68 100644 --- a/src/main/drivers/serial_escserial.c +++ b/src/main/drivers/serial_escserial.c @@ -28,8 +28,8 @@ #include "common/utils.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/io.h" #include "drivers/light_led.h" diff --git a/src/main/drivers/serial_pinconfig.c b/src/main/drivers/serial_pinconfig.c index e1c4e2bb7d..eae46c27d2 100644 --- a/src/main/drivers/serial_pinconfig.c +++ b/src/main/drivers/serial_pinconfig.c @@ -27,8 +27,8 @@ #include "drivers/serial.h" #include "drivers/serial_uart.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" // Backward compatibility for exisiting targets diff --git a/src/main/fc/config.c b/src/main/fc/config.c index 7bda793f0f..644391d440 100644 --- a/src/main/fc/config.c +++ b/src/main/fc/config.c @@ -36,8 +36,8 @@ #include "config/config_eeprom.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/accgyro/accgyro.h" #include "drivers/bus_spi.h" diff --git a/src/main/fc/config.h b/src/main/fc/config.h index acc4eb5a4e..e3c330e103 100644 --- a/src/main/fc/config.h +++ b/src/main/fc/config.h @@ -20,7 +20,7 @@ #include #include -#include "config/parameter_group.h" +#include "pg/pg.h" #include "drivers/flash.h" #include "drivers/rx_pwm.h" diff --git a/src/main/fc/controlrate_profile.c b/src/main/fc/controlrate_profile.c index b8a4c65d52..c5ce7f1485 100644 --- a/src/main/fc/controlrate_profile.c +++ b/src/main/fc/controlrate_profile.c @@ -24,8 +24,8 @@ #include "common/axis.h" #include "config/config_reset.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "fc/config.h" #include "fc/controlrate_profile.h" diff --git a/src/main/fc/controlrate_profile.h b/src/main/fc/controlrate_profile.h index 2978d9110a..cafd4f71fd 100644 --- a/src/main/fc/controlrate_profile.h +++ b/src/main/fc/controlrate_profile.h @@ -19,7 +19,7 @@ #include -#include "config/parameter_group.h" +#include "pg/pg.h" typedef struct controlRateConfig_s { diff --git a/src/main/fc/fc_core.c b/src/main/fc/fc_core.c index ade2a5fa1d..7e62a5e09a 100644 --- a/src/main/fc/fc_core.c +++ b/src/main/fc/fc_core.c @@ -31,8 +31,8 @@ #include "common/utils.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/light_led.h" #include "drivers/system.h" diff --git a/src/main/fc/fc_core.h b/src/main/fc/fc_core.h index f6f3b20f00..a136cd73ab 100644 --- a/src/main/fc/fc_core.h +++ b/src/main/fc/fc_core.h @@ -18,7 +18,7 @@ #pragma once #include "common/time.h" -#include "config/parameter_group.h" +#include "pg/pg.h" #if defined(USE_GPS) || defined(USE_MAG) extern int16_t magHold; diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c index 9ee5a22d30..2bc57561cb 100644 --- a/src/main/fc/fc_init.c +++ b/src/main/fc/fc_init.c @@ -30,8 +30,8 @@ #include "config/config_eeprom.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "cms/cms.h" #include "cms/cms_types.h" diff --git a/src/main/fc/rc_adjustments.c b/src/main/fc/rc_adjustments.c index 90f3957fad..450a710d06 100644 --- a/src/main/fc/rc_adjustments.c +++ b/src/main/fc/rc_adjustments.c @@ -34,8 +34,8 @@ #include "drivers/time.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "config/feature.h" #include "flight/pid.h" diff --git a/src/main/fc/rc_adjustments.h b/src/main/fc/rc_adjustments.h index 6373cd8031..805c76f052 100644 --- a/src/main/fc/rc_adjustments.h +++ b/src/main/fc/rc_adjustments.h @@ -18,7 +18,7 @@ #pragma once #include -#include "config/parameter_group.h" +#include "pg/pg.h" #include "fc/rc_modes.h" typedef enum { diff --git a/src/main/fc/rc_controls.c b/src/main/fc/rc_controls.c index e02ba8ede0..c5f988c5d5 100644 --- a/src/main/fc/rc_controls.c +++ b/src/main/fc/rc_controls.c @@ -31,8 +31,8 @@ #include "common/maths.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "cms/cms.h" diff --git a/src/main/fc/rc_controls.h b/src/main/fc/rc_controls.h index a7eb5c10a0..08ef03147c 100644 --- a/src/main/fc/rc_controls.h +++ b/src/main/fc/rc_controls.h @@ -19,7 +19,7 @@ #include -#include "config/parameter_group.h" +#include "pg/pg.h" typedef enum rc_alias { ROLL = 0, diff --git a/src/main/fc/rc_modes.c b/src/main/fc/rc_modes.c index dffc8e4cd0..ad8a752c0d 100644 --- a/src/main/fc/rc_modes.c +++ b/src/main/fc/rc_modes.c @@ -27,8 +27,8 @@ #include "common/maths.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "fc/config.h" #include "fc/rc_controls.h" diff --git a/src/main/fc/rc_modes.h b/src/main/fc/rc_modes.h index ec217e7aa1..980548ef25 100644 --- a/src/main/fc/rc_modes.h +++ b/src/main/fc/rc_modes.h @@ -19,7 +19,7 @@ #include -#include "config/parameter_group.h" +#include "pg/pg.h" typedef enum { BOXARM = 0, diff --git a/src/main/flight/altitude.c b/src/main/flight/altitude.c index 209b708fdc..0f3a1091fd 100644 --- a/src/main/flight/altitude.c +++ b/src/main/flight/altitude.c @@ -28,8 +28,8 @@ #include "common/axis.h" #include "common/maths.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "fc/config.h" #include "fc/rc_controls.h" diff --git a/src/main/flight/failsafe.c b/src/main/flight/failsafe.c index ddf1926029..45a3890755 100644 --- a/src/main/flight/failsafe.c +++ b/src/main/flight/failsafe.c @@ -24,8 +24,8 @@ #include "common/axis.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/time.h" diff --git a/src/main/flight/failsafe.h b/src/main/flight/failsafe.h index 0d179fbcba..f792e393c9 100644 --- a/src/main/flight/failsafe.h +++ b/src/main/flight/failsafe.h @@ -17,7 +17,7 @@ #pragma once -#include "config/parameter_group.h" +#include "pg/pg.h" #define FAILSAFE_POWER_ON_DELAY_US (1000 * 1000 * 5) #define MILLIS_PER_TENTH_SECOND 100 diff --git a/src/main/flight/imu.c b/src/main/flight/imu.c index 7c29d87129..c88c01947d 100644 --- a/src/main/flight/imu.c +++ b/src/main/flight/imu.c @@ -28,8 +28,8 @@ #include "common/axis.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/time.h" diff --git a/src/main/flight/imu.h b/src/main/flight/imu.h index 84b27f54f9..8927fdf9f4 100644 --- a/src/main/flight/imu.h +++ b/src/main/flight/imu.h @@ -20,7 +20,7 @@ #include "common/axis.h" #include "common/time.h" #include "common/maths.h" -#include "config/parameter_group.h" +#include "pg/pg.h" // Exported symbols extern uint32_t accTimeSum; diff --git a/src/main/flight/mixer.c b/src/main/flight/mixer.c index abc300999a..8844ef3caa 100644 --- a/src/main/flight/mixer.c +++ b/src/main/flight/mixer.c @@ -30,8 +30,8 @@ #include "common/maths.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/pwm_output.h" #include "drivers/pwm_esc_detect.h" diff --git a/src/main/flight/mixer.h b/src/main/flight/mixer.h index 069873ec7b..9fb3c460a0 100644 --- a/src/main/flight/mixer.h +++ b/src/main/flight/mixer.h @@ -20,7 +20,7 @@ #include "platform.h" #include "common/time.h" -#include "config/parameter_group.h" +#include "pg/pg.h" #include "drivers/pwm_output_counts.h" #include "drivers/io_types.h" #include "drivers/pwm_output.h" diff --git a/src/main/flight/navigation.c b/src/main/flight/navigation.c index d31572d39d..d22428531e 100644 --- a/src/main/flight/navigation.c +++ b/src/main/flight/navigation.c @@ -30,8 +30,8 @@ #include "common/maths.h" #include "common/time.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/time.h" diff --git a/src/main/flight/pid.c b/src/main/flight/pid.c index 6cb9450498..7f0d4f1a90 100644 --- a/src/main/flight/pid.c +++ b/src/main/flight/pid.c @@ -30,8 +30,8 @@ #include "common/filter.h" #include "config/config_reset.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/sound_beeper.h" #include "drivers/time.h" diff --git a/src/main/flight/pid.h b/src/main/flight/pid.h index ba6f99415e..ca032d7904 100644 --- a/src/main/flight/pid.h +++ b/src/main/flight/pid.h @@ -19,7 +19,7 @@ #include #include "common/time.h" -#include "config/parameter_group.h" +#include "pg/pg.h" #define MAX_PID_PROCESS_DENOM 16 #define PID_CONTROLLER_BETAFLIGHT 1 diff --git a/src/main/flight/servos.c b/src/main/flight/servos.c index c8b4be36ab..10f3277429 100644 --- a/src/main/flight/servos.c +++ b/src/main/flight/servos.c @@ -31,8 +31,8 @@ #include "config/config_reset.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/pwm_output.h" diff --git a/src/main/flight/servos.h b/src/main/flight/servos.h index 10444ee2c0..db43133fd2 100644 --- a/src/main/flight/servos.h +++ b/src/main/flight/servos.h @@ -17,7 +17,7 @@ #pragma once -#include "config/parameter_group.h" +#include "pg/pg.h" #include "drivers/io_types.h" #include "drivers/pwm_output.h" diff --git a/src/main/interface/cli.c b/src/main/interface/cli.c index 4948cc1b09..4c587badde 100644 --- a/src/main/interface/cli.c +++ b/src/main/interface/cli.c @@ -53,8 +53,8 @@ extern uint8_t __config_end; #include "config/config_eeprom.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/accgyro/accgyro.h" #include "drivers/buf_writer.h" diff --git a/src/main/interface/msp.c b/src/main/interface/msp.c index e6606a7b64..2697ea2aaa 100644 --- a/src/main/interface/msp.c +++ b/src/main/interface/msp.c @@ -38,8 +38,8 @@ #include "config/config_eeprom.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/accgyro/accgyro.h" #include "drivers/bus_i2c.h" diff --git a/src/main/interface/settings.c b/src/main/interface/settings.c index d38a6221c5..1cc351b303 100644 --- a/src/main/interface/settings.c +++ b/src/main/interface/settings.c @@ -28,8 +28,8 @@ #include "common/utils.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/adc.h" #include "drivers/bus_i2c.h" diff --git a/src/main/interface/settings.h b/src/main/interface/settings.h index ed35ce95ff..f1d8dda2f8 100644 --- a/src/main/interface/settings.h +++ b/src/main/interface/settings.h @@ -19,7 +19,7 @@ #include #include -#include "config/parameter_group.h" +#include "pg/pg.h" typedef enum { diff --git a/src/main/io/beeper.c b/src/main/io/beeper.c index 549af0bb0c..94666ca0e4 100644 --- a/src/main/io/beeper.c +++ b/src/main/io/beeper.c @@ -23,8 +23,8 @@ #include "common/utils.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/sound_beeper.h" #include "drivers/time.h" diff --git a/src/main/io/beeper.h b/src/main/io/beeper.h index 1b441ea4ad..fa8ac88f88 100644 --- a/src/main/io/beeper.h +++ b/src/main/io/beeper.h @@ -18,7 +18,7 @@ #pragma once #include "common/time.h" -#include "config/parameter_group.h" +#include "pg/pg.h" typedef enum { // IMPORTANT: these are in priority order, 0 = Highest diff --git a/src/main/io/dashboard.c b/src/main/io/dashboard.c index ba6bd94371..3a98ec4cf5 100644 --- a/src/main/io/dashboard.c +++ b/src/main/io/dashboard.c @@ -44,8 +44,8 @@ #include "common/typeconversion.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "fc/config.h" #include "fc/controlrate_profile.h" diff --git a/src/main/io/dashboard.h b/src/main/io/dashboard.h index 8ea6310769..136939d21e 100644 --- a/src/main/io/dashboard.h +++ b/src/main/io/dashboard.h @@ -18,7 +18,7 @@ #pragma once #include "common/time.h" -#include "config/parameter_group.h" +#include "pg/pg.h" #include "drivers/bus_i2c.h" #define ENABLE_DEBUG_DASHBOARD_PAGE diff --git a/src/main/io/displayport_max7456.c b/src/main/io/displayport_max7456.c index 2c24e751b8..2c443fef59 100644 --- a/src/main/io/displayport_max7456.c +++ b/src/main/io/displayport_max7456.c @@ -24,8 +24,8 @@ #include "common/utils.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/display.h" #include "drivers/max7456.h" diff --git a/src/main/io/displayport_max7456.h b/src/main/io/displayport_max7456.h index f02611e135..a80199cc46 100644 --- a/src/main/io/displayport_max7456.h +++ b/src/main/io/displayport_max7456.h @@ -17,7 +17,7 @@ #pragma once -#include "config/parameter_group.h" +#include "pg/pg.h" #include "drivers/display.h" PG_DECLARE(displayPortProfile_t, displayPortProfileMax7456); diff --git a/src/main/io/displayport_msp.c b/src/main/io/displayport_msp.c index 434ca3868e..0d1d3e7299 100644 --- a/src/main/io/displayport_msp.c +++ b/src/main/io/displayport_msp.c @@ -26,8 +26,8 @@ #include "common/utils.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/display.h" diff --git a/src/main/io/displayport_msp.h b/src/main/io/displayport_msp.h index 8730f19f79..c4ed98333c 100644 --- a/src/main/io/displayport_msp.h +++ b/src/main/io/displayport_msp.h @@ -17,7 +17,7 @@ #pragma once -#include "config/parameter_group.h" +#include "pg/pg.h" #include "drivers/display.h" PG_DECLARE(displayPortProfile_t, displayPortProfileMsp); diff --git a/src/main/io/gimbal.h b/src/main/io/gimbal.h index 969242fee3..287a605dcd 100644 --- a/src/main/io/gimbal.h +++ b/src/main/io/gimbal.h @@ -17,7 +17,7 @@ #pragma once -#include "config/parameter_group.h" +#include "pg/pg.h" typedef enum { GIMBAL_MODE_NORMAL = 0, diff --git a/src/main/io/gps.c b/src/main/io/gps.c index 10e29acd0d..be9dc10688 100644 --- a/src/main/io/gps.c +++ b/src/main/io/gps.c @@ -35,8 +35,8 @@ #include "common/utils.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/light_led.h" #include "drivers/time.h" diff --git a/src/main/io/gps.h b/src/main/io/gps.h index 7a5bf622e0..fcdaced4cf 100644 --- a/src/main/io/gps.h +++ b/src/main/io/gps.h @@ -20,7 +20,7 @@ #include "common/axis.h" #include "common/time.h" -#include "config/parameter_group.h" +#include "pg/pg.h" #define LAT 0 #define LON 1 diff --git a/src/main/io/ledstrip.c b/src/main/io/ledstrip.c index 6e7f64dfd0..0457558009 100644 --- a/src/main/io/ledstrip.c +++ b/src/main/io/ledstrip.c @@ -35,8 +35,8 @@ #include "common/utils.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/light_ws2811strip.h" #include "drivers/serial.h" diff --git a/src/main/io/ledstrip.h b/src/main/io/ledstrip.h index 3c03e254f2..9fe25728f8 100644 --- a/src/main/io/ledstrip.h +++ b/src/main/io/ledstrip.h @@ -19,7 +19,7 @@ #include "common/color.h" #include "common/time.h" -#include "config/parameter_group.h" +#include "pg/pg.h" #include "drivers/io_types.h" #define LED_MAX_STRIP_LENGTH 32 diff --git a/src/main/io/osd.c b/src/main/io/osd.c index 84dd4f1640..44718deb22 100644 --- a/src/main/io/osd.c +++ b/src/main/io/osd.c @@ -49,8 +49,8 @@ #include "common/utils.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/display.h" #include "drivers/max7456_symbols.h" diff --git a/src/main/io/osd.h b/src/main/io/osd.h index 8620f852d4..718113043b 100644 --- a/src/main/io/osd.h +++ b/src/main/io/osd.h @@ -18,7 +18,7 @@ #pragma once #include "common/time.h" -#include "config/parameter_group.h" +#include "pg/pg.h" #define OSD_NUM_TIMER_TYPES 3 extern const char * const osdTimerSourceNames[OSD_NUM_TIMER_TYPES]; diff --git a/src/main/io/serial.c b/src/main/io/serial.c index 7dc0f9bbff..c345de868a 100644 --- a/src/main/io/serial.c +++ b/src/main/io/serial.c @@ -25,8 +25,8 @@ #include "common/utils.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "fc/config.h" diff --git a/src/main/io/serial.h b/src/main/io/serial.h index 8b6fde54b8..22377320be 100644 --- a/src/main/io/serial.h +++ b/src/main/io/serial.h @@ -20,7 +20,7 @@ #include #include -#include "config/parameter_group.h" +#include "pg/pg.h" #include "drivers/serial.h" typedef enum { diff --git a/src/main/io/transponder_ir.c b/src/main/io/transponder_ir.c index d1612e5b2b..f28b711225 100644 --- a/src/main/io/transponder_ir.c +++ b/src/main/io/transponder_ir.c @@ -27,8 +27,8 @@ #include "build/build_config.h" #include "config/config_reset.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/timer.h" #include "drivers/transponder_ir.h" diff --git a/src/main/io/transponder_ir.h b/src/main/io/transponder_ir.h index 2b67ac0783..aa795bc4e6 100644 --- a/src/main/io/transponder_ir.h +++ b/src/main/io/transponder_ir.h @@ -18,7 +18,7 @@ #pragma once #include "common/time.h" -#include "config/parameter_group.h" +#include "pg/pg.h" typedef struct transponderConfig_s { transponderProvider_e provider; diff --git a/src/main/io/vtx.c b/src/main/io/vtx.c index f3884e1a8a..5913d4ac27 100644 --- a/src/main/io/vtx.c +++ b/src/main/io/vtx.c @@ -25,8 +25,8 @@ #include "common/time.h" #include "common/maths.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/vtx_common.h" diff --git a/src/main/io/vtx.h b/src/main/io/vtx.h index 0e5a3c836b..1457e2c85a 100644 --- a/src/main/io/vtx.h +++ b/src/main/io/vtx.h @@ -21,7 +21,7 @@ #include "platform.h" #include "common/time.h" -#include "config/parameter_group.h" +#include "pg/pg.h" typedef struct vtxSettingsConfig_s { uint8_t band; // 1=A, 2=B, 3=E, 4=F(Airwaves/Fatshark), 5=Raceband diff --git a/src/main/io/vtx_control.c b/src/main/io/vtx_control.c index 275f23093a..bd9d2789e0 100644 --- a/src/main/io/vtx_control.c +++ b/src/main/io/vtx_control.c @@ -26,8 +26,8 @@ #include "common/maths.h" #include "config/config_eeprom.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/buttons.h" #include "drivers/light_led.h" diff --git a/src/main/io/vtx_control.h b/src/main/io/vtx_control.h index 66c202d446..9820973a63 100644 --- a/src/main/io/vtx_control.h +++ b/src/main/io/vtx_control.h @@ -22,7 +22,7 @@ #include "platform.h" -#include "config/parameter_group.h" +#include "pg/pg.h" #include "fc/rc_modes.h" #define MAX_CHANNEL_ACTIVATION_CONDITION_COUNT 10 diff --git a/src/main/io/vtx_rtc6705.c b/src/main/io/vtx_rtc6705.c index 0110af3a5e..fd4830761a 100644 --- a/src/main/io/vtx_rtc6705.c +++ b/src/main/io/vtx_rtc6705.c @@ -34,8 +34,8 @@ #include "common/utils.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/max7456.h" #include "drivers/system.h" diff --git a/src/main/io/vtx_smartaudio.c b/src/main/io/vtx_smartaudio.c index 0238f45ab0..ff770b377f 100644 --- a/src/main/io/vtx_smartaudio.c +++ b/src/main/io/vtx_smartaudio.c @@ -37,8 +37,8 @@ #include "common/printf.h" #include "common/utils.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/serial.h" #include "drivers/time.h" diff --git a/src/main/osd_slave/osd_slave_init.c b/src/main/osd_slave/osd_slave_init.c index 03cd8c09ec..55d39d5ab2 100644 --- a/src/main/osd_slave/osd_slave_init.c +++ b/src/main/osd_slave/osd_slave_init.c @@ -30,8 +30,8 @@ #include "config/config_eeprom.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/adc.h" #include "drivers/bus.h" diff --git a/src/main/pg/adc.c b/src/main/pg/adc.c index dca2e92bc7..0073a5fbd6 100644 --- a/src/main/pg/adc.c +++ b/src/main/pg/adc.c @@ -22,8 +22,8 @@ #ifdef USE_ADC -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/adc_impl.h" #include "drivers/io.h" diff --git a/src/main/pg/adc.h b/src/main/pg/adc.h index be02ea0487..c919e24b8f 100644 --- a/src/main/pg/adc.h +++ b/src/main/pg/adc.h @@ -20,7 +20,7 @@ #include #include -#include "config/parameter_group.h" +#include "pg/pg.h" #include "drivers/io_types.h" typedef struct adcChannelConfig_t { diff --git a/src/main/config/parameter_group.c b/src/main/pg/pg.c similarity index 98% rename from src/main/config/parameter_group.c rename to src/main/pg/pg.c index a64d0eb973..2f1d6ea317 100644 --- a/src/main/config/parameter_group.c +++ b/src/main/pg/pg.c @@ -21,9 +21,10 @@ #include "platform.h" -#include "parameter_group.h" #include "common/maths.h" +#include "pg.h" + const pgRegistry_t* pgFind(pgn_t pgn) { PG_FOREACH(reg) { diff --git a/src/main/config/parameter_group.h b/src/main/pg/pg.h similarity index 100% rename from src/main/config/parameter_group.h rename to src/main/pg/pg.h diff --git a/src/main/config/parameter_group_ids.h b/src/main/pg/pg_ids.h similarity index 100% rename from src/main/config/parameter_group_ids.h rename to src/main/pg/pg_ids.h diff --git a/src/main/rx/cc2500_frsky_d.c b/src/main/rx/cc2500_frsky_d.c index b2c3da1639..2522f76546 100644 --- a/src/main/rx/cc2500_frsky_d.c +++ b/src/main/rx/cc2500_frsky_d.c @@ -39,7 +39,7 @@ #include "fc/config.h" #include "config/feature.h" -#include "config/parameter_group_ids.h" +#include "pg/pg_ids.h" #include "rx/rx.h" #include "rx/rx_spi.h" diff --git a/src/main/rx/cc2500_frsky_shared.c b/src/main/rx/cc2500_frsky_shared.c index 4ebe61a98b..2c7876c54c 100644 --- a/src/main/rx/cc2500_frsky_shared.c +++ b/src/main/rx/cc2500_frsky_shared.c @@ -29,8 +29,8 @@ #include "fc/config.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "rx/rx.h" diff --git a/src/main/rx/cc2500_frsky_x.c b/src/main/rx/cc2500_frsky_x.c index e228b5cd24..4d0288eff9 100644 --- a/src/main/rx/cc2500_frsky_x.c +++ b/src/main/rx/cc2500_frsky_x.c @@ -26,8 +26,8 @@ #include "build/debug.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "common/maths.h" #include "common/utils.h" diff --git a/src/main/rx/flysky.c b/src/main/rx/flysky.c index adac610932..dd8381ed5a 100644 --- a/src/main/rx/flysky.c +++ b/src/main/rx/flysky.c @@ -26,7 +26,7 @@ #include "common/maths.h" #include "common/utils.h" #include "config/config_eeprom.h" -#include "config/parameter_group_ids.h" +#include "pg/pg_ids.h" #include "fc/config.h" #include "rx/rx.h" diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c index f4aa39c8a8..a8e9dbcbe9 100644 --- a/src/main/rx/rx.c +++ b/src/main/rx/rx.c @@ -31,8 +31,8 @@ #include "config/config_reset.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/adc.h" #include "drivers/rx_pwm.h" diff --git a/src/main/rx/rx.h b/src/main/rx/rx.h index cf9a51cf37..5f389c192a 100644 --- a/src/main/rx/rx.h +++ b/src/main/rx/rx.h @@ -19,7 +19,7 @@ #include "common/time.h" -#include "config/parameter_group.h" +#include "pg/pg.h" #include "drivers/io_types.h" diff --git a/src/main/sensors/acceleration.c b/src/main/sensors/acceleration.c index 70a317815d..c935c44bcd 100644 --- a/src/main/sensors/acceleration.c +++ b/src/main/sensors/acceleration.c @@ -29,8 +29,8 @@ #include "config/config_reset.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/accgyro/accgyro.h" #include "drivers/accgyro/accgyro_adxl345.h" diff --git a/src/main/sensors/acceleration.h b/src/main/sensors/acceleration.h index b848aa5404..d00ff359e8 100644 --- a/src/main/sensors/acceleration.h +++ b/src/main/sensors/acceleration.h @@ -18,7 +18,7 @@ #pragma once #include "common/time.h" -#include "config/parameter_group.h" +#include "pg/pg.h" #include "drivers/accgyro/accgyro.h" #include "sensors/sensors.h" diff --git a/src/main/sensors/barometer.c b/src/main/sensors/barometer.c index 921e7eaf23..9591bfde54 100644 --- a/src/main/sensors/barometer.c +++ b/src/main/sensors/barometer.c @@ -23,8 +23,8 @@ #include "common/maths.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/bus.h" #include "drivers/bus_spi.h" diff --git a/src/main/sensors/barometer.h b/src/main/sensors/barometer.h index da98f4066b..29df5a7a8b 100644 --- a/src/main/sensors/barometer.h +++ b/src/main/sensors/barometer.h @@ -17,7 +17,7 @@ #pragma once -#include "config/parameter_group.h" +#include "pg/pg.h" #include "drivers/barometer/barometer.h" typedef enum { diff --git a/src/main/sensors/battery.c b/src/main/sensors/battery.c index 78b3786654..757a620ceb 100644 --- a/src/main/sensors/battery.c +++ b/src/main/sensors/battery.c @@ -27,8 +27,8 @@ #include "common/utils.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/adc.h" diff --git a/src/main/sensors/battery.h b/src/main/sensors/battery.h index fa0579fb09..55238d84b2 100644 --- a/src/main/sensors/battery.h +++ b/src/main/sensors/battery.h @@ -17,7 +17,7 @@ #pragma once -#include "config/parameter_group.h" +#include "pg/pg.h" #include "common/filter.h" #include "common/time.h" diff --git a/src/main/sensors/boardalignment.c b/src/main/sensors/boardalignment.c index b30e192079..5377e8cff5 100644 --- a/src/main/sensors/boardalignment.c +++ b/src/main/sensors/boardalignment.c @@ -25,8 +25,8 @@ #include "common/maths.h" #include "common/axis.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/sensor.h" diff --git a/src/main/sensors/boardalignment.h b/src/main/sensors/boardalignment.h index 8c224f24e2..6ac188ea8a 100644 --- a/src/main/sensors/boardalignment.h +++ b/src/main/sensors/boardalignment.h @@ -17,7 +17,7 @@ #pragma once -#include "config/parameter_group.h" +#include "pg/pg.h" typedef struct boardAlignment_s { int32_t rollDegrees; diff --git a/src/main/sensors/compass.c b/src/main/sensors/compass.c index 57114d1ca7..f31f95e782 100644 --- a/src/main/sensors/compass.c +++ b/src/main/sensors/compass.c @@ -22,8 +22,8 @@ #include "common/axis.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/bus_i2c.h" #include "drivers/bus_spi.h" diff --git a/src/main/sensors/compass.h b/src/main/sensors/compass.h index 24a085231c..ae11c2a1fd 100644 --- a/src/main/sensors/compass.h +++ b/src/main/sensors/compass.h @@ -17,7 +17,7 @@ #pragma once -#include "config/parameter_group.h" +#include "pg/pg.h" #include "drivers/io.h" #include "drivers/sensor.h" diff --git a/src/main/sensors/current.c b/src/main/sensors/current.c index 27aa0b7746..5366ea52e6 100644 --- a/src/main/sensors/current.c +++ b/src/main/sensors/current.c @@ -28,8 +28,8 @@ #include "drivers/adc.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "config/config_reset.h" #include "sensors/current.h" diff --git a/src/main/sensors/esc_sensor.c b/src/main/sensors/esc_sensor.c index 523da5ee5e..7c5942ae89 100644 --- a/src/main/sensors/esc_sensor.c +++ b/src/main/sensors/esc_sensor.c @@ -26,8 +26,8 @@ #include "build/debug.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "common/maths.h" #include "common/utils.h" diff --git a/src/main/sensors/gyro.c b/src/main/sensors/gyro.c index 014d7853d9..d1dc5a0380 100644 --- a/src/main/sensors/gyro.c +++ b/src/main/sensors/gyro.c @@ -29,8 +29,8 @@ #include "common/maths.h" #include "common/filter.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/accgyro/accgyro.h" #include "drivers/accgyro/accgyro_adxl345.h" diff --git a/src/main/sensors/gyro.h b/src/main/sensors/gyro.h index 5db1a81483..f44418c91c 100644 --- a/src/main/sensors/gyro.h +++ b/src/main/sensors/gyro.h @@ -19,7 +19,7 @@ #include "common/axis.h" #include "common/time.h" -#include "config/parameter_group.h" +#include "pg/pg.h" #include "drivers/bus.h" #include "drivers/sensor.h" diff --git a/src/main/sensors/gyroanalyse.c b/src/main/sensors/gyroanalyse.c index 1c3a7c0e30..278280b2b3 100644 --- a/src/main/sensors/gyroanalyse.c +++ b/src/main/sensors/gyroanalyse.c @@ -30,8 +30,8 @@ #include "common/utils.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/accgyro/accgyro.h" #include "drivers/time.h" diff --git a/src/main/sensors/initialisation.c b/src/main/sensors/initialisation.c index c5cecf4d6a..8a6bfcb786 100644 --- a/src/main/sensors/initialisation.c +++ b/src/main/sensors/initialisation.c @@ -24,8 +24,8 @@ #include "common/utils.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "fc/config.h" #include "fc/runtime_config.h" diff --git a/src/main/sensors/sonar.c b/src/main/sensors/sonar.c index 6f90170c27..a588319207 100644 --- a/src/main/sensors/sonar.c +++ b/src/main/sensors/sonar.c @@ -29,8 +29,8 @@ #include "common/utils.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/io.h" diff --git a/src/main/sensors/sonar.h b/src/main/sensors/sonar.h index 43a5ac2c7d..2efc958e22 100644 --- a/src/main/sensors/sonar.h +++ b/src/main/sensors/sonar.h @@ -17,7 +17,7 @@ #pragma once -#include "config/parameter_group.h" +#include "pg/pg.h" #include "common/time.h" #include "drivers/sonar_hcsr04.h" #include "sensors/battery.h" diff --git a/src/main/sensors/voltage.c b/src/main/sensors/voltage.c index fa0430cd54..b660a7cfcc 100644 --- a/src/main/sensors/voltage.c +++ b/src/main/sensors/voltage.c @@ -29,8 +29,8 @@ #include "drivers/adc.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "config/config_reset.h" #include "sensors/voltage.h" diff --git a/src/main/target/OMNIBUSF4/config.c b/src/main/target/OMNIBUSF4/config.c index a220e90a34..63b7cebad6 100644 --- a/src/main/target/OMNIBUSF4/config.c +++ b/src/main/target/OMNIBUSF4/config.c @@ -22,7 +22,7 @@ #ifdef USE_TARGET_CONFIG -#include "config/parameter_group.h" +#include "pg/pg.h" #include "drivers/max7456.h" #include "io/serial.h" diff --git a/src/main/target/SITL/README.md b/src/main/target/SITL/README.md index 55234bc09d..37c0e4821b 100644 --- a/src/main/target/SITL/README.md +++ b/src/main/target/SITL/README.md @@ -44,4 +44,4 @@ gazebo -> betaflight `udp://127.0.0.1:9003` UARTx will bind on `tcp://127.0.0.1:576x` when port been open. `eeprom.bin`, size 8192 Byte, is for config saving. -size can be changed in `src/main/target/SITL/parameter_group.ld` >> `__FLASH_CONFIG_Size` +size can be changed in `src/main/target/SITL/pg.ld` >> `__FLASH_CONFIG_Size` diff --git a/src/main/target/SITL/parameter_group.ld b/src/main/target/SITL/pg.ld similarity index 100% rename from src/main/target/SITL/parameter_group.ld rename to src/main/target/SITL/pg.ld diff --git a/src/main/telemetry/crsf.c b/src/main/telemetry/crsf.c index ad6d8270cb..c3917d368d 100644 --- a/src/main/telemetry/crsf.c +++ b/src/main/telemetry/crsf.c @@ -28,8 +28,8 @@ #include "build/version.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "common/crc.h" #include "common/maths.h" diff --git a/src/main/telemetry/frsky.c b/src/main/telemetry/frsky.c index a6553e573c..9b37e2e91b 100644 --- a/src/main/telemetry/frsky.c +++ b/src/main/telemetry/frsky.c @@ -33,8 +33,8 @@ #include "common/utils.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/accgyro/accgyro.h" #include "drivers/sensor.h" diff --git a/src/main/telemetry/ibus.c b/src/main/telemetry/ibus.c index b826a3c2bb..7a5fb9edb8 100644 --- a/src/main/telemetry/ibus.c +++ b/src/main/telemetry/ibus.c @@ -34,8 +34,8 @@ #include "common/utils.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/accgyro/accgyro.h" #include "drivers/sensor.h" diff --git a/src/main/telemetry/ibus_shared.c b/src/main/telemetry/ibus_shared.c index 5d3e7c6634..716a439289 100644 --- a/src/main/telemetry/ibus_shared.c +++ b/src/main/telemetry/ibus_shared.c @@ -38,8 +38,8 @@ static uint16_t calculateChecksum(const uint8_t *ibusPacket, size_t packetLength #if defined(USE_TELEMETRY) && defined(USE_TELEMETRY_IBUS) -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "sensors/battery.h" #include "fc/rc_controls.h" #include "sensors/gyro.h" diff --git a/src/main/telemetry/mavlink.c b/src/main/telemetry/mavlink.c index 8389722283..03e64810df 100644 --- a/src/main/telemetry/mavlink.c +++ b/src/main/telemetry/mavlink.c @@ -33,8 +33,8 @@ #include "common/color.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/accgyro/accgyro.h" #include "drivers/sensor.h" diff --git a/src/main/telemetry/smartport.c b/src/main/telemetry/smartport.c index 8349ccc4b7..16f3b2d3a1 100644 --- a/src/main/telemetry/smartport.c +++ b/src/main/telemetry/smartport.c @@ -18,8 +18,8 @@ #include "common/utils.h" #include "config/feature.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/accgyro/accgyro.h" #include "drivers/compass/compass.h" diff --git a/src/main/telemetry/telemetry.c b/src/main/telemetry/telemetry.c index dbf565942e..eba0fa7bf4 100644 --- a/src/main/telemetry/telemetry.c +++ b/src/main/telemetry/telemetry.c @@ -25,8 +25,8 @@ #include "common/utils.h" -#include "config/parameter_group.h" -#include "config/parameter_group_ids.h" +#include "pg/pg.h" +#include "pg/pg_ids.h" #include "drivers/timer.h" #include "drivers/serial.h" diff --git a/src/main/telemetry/telemetry.h b/src/main/telemetry/telemetry.h index 6bcf91b1ff..b1364791db 100644 --- a/src/main/telemetry/telemetry.h +++ b/src/main/telemetry/telemetry.h @@ -24,7 +24,7 @@ #pragma once -#include "config/parameter_group.h" +#include "pg/pg.h" #include "io/serial.h" typedef enum { diff --git a/src/test/Makefile b/src/test/Makefile index 79af7e1ade..d2d82b5d07 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -85,7 +85,7 @@ blackbox_encoding_unittest_SRC := \ cli_unittest_SRC := \ $(USER_DIR)/interface/cli.c \ $(USER_DIR)/config/feature.c \ - $(USER_DIR)/config/parameter_group.c \ + $(USER_DIR)/pg/pg.c \ $(USER_DIR)/common/typeconversion.c cli_unittest_DEFINES := \ @@ -163,13 +163,13 @@ osd_unittest_DEFINES := \ USE_RTC_TIME -parameter_groups_unittest_SRC := \ - $(USER_DIR)/config/parameter_group.c +pg_unittest_SRC := \ + $(USER_DIR)/pg/pg.c rc_controls_unittest_SRC := \ $(USER_DIR)/fc/rc_controls.c \ - $(USER_DIR)/config/parameter_group.c \ + $(USER_DIR)/pg/pg.c \ $(USER_DIR)/common/bitarray.c \ $(USER_DIR)/common/maths.c \ $(USER_DIR)/fc/rc_adjustments.c \ @@ -343,7 +343,7 @@ CXX_FLAGS += $(COVERAGE_FLAGS) ifdef MACOSX LDFLAGS += -Wl,-map,$(OBJECT_DIR)/$@.map else -LDFLAGS += -Wl,-T,$(TEST_DIR)/parameter_group.ld -Wl,-Map,$(OBJECT_DIR)/$@.map +LDFLAGS += -Wl,-T,$(TEST_DIR)/pg.ld -Wl,-Map,$(OBJECT_DIR)/$@.map endif # Gather up all of the tests. diff --git a/src/test/unit/arming_prevention_unittest.cc b/src/test/unit/arming_prevention_unittest.cc index 04d9756d18..8eb233b8ff 100644 --- a/src/test/unit/arming_prevention_unittest.cc +++ b/src/test/unit/arming_prevention_unittest.cc @@ -21,8 +21,8 @@ extern "C" { #include "blackbox/blackbox.h" #include "build/debug.h" #include "common/maths.h" - #include "config/parameter_group.h" - #include "config/parameter_group_ids.h" + #include "pg/pg.h" + #include "pg/pg_ids.h" #include "fc/config.h" #include "fc/controlrate_profile.h" #include "fc/fc_core.h" diff --git a/src/test/unit/blackbox_encoding_unittest.cc b/src/test/unit/blackbox_encoding_unittest.cc index 99902d55a7..3167e43088 100644 --- a/src/test/unit/blackbox_encoding_unittest.cc +++ b/src/test/unit/blackbox_encoding_unittest.cc @@ -24,8 +24,8 @@ extern "C" { #include "blackbox/blackbox_encoding.h" #include "common/utils.h" - #include "config/parameter_group.h" - #include "config/parameter_group_ids.h" + #include "pg/pg.h" + #include "pg/pg_ids.h" #include "drivers/serial.h" #include "io/serial.h" diff --git a/src/test/unit/blackbox_unittest.cc b/src/test/unit/blackbox_unittest.cc index c35fcbb231..e536251629 100644 --- a/src/test/unit/blackbox_unittest.cc +++ b/src/test/unit/blackbox_unittest.cc @@ -23,8 +23,8 @@ extern "C" { #include "blackbox/blackbox.h" #include "common/utils.h" - #include "config/parameter_group.h" - #include "config/parameter_group_ids.h" + #include "pg/pg.h" + #include "pg/pg_ids.h" #include "drivers/accgyro/accgyro.h" #include "drivers/accgyro/gyro_sync.h" diff --git a/src/test/unit/cli_unittest.cc b/src/test/unit/cli_unittest.cc index 75f51d61d1..26df59d9ec 100644 --- a/src/test/unit/cli_unittest.cc +++ b/src/test/unit/cli_unittest.cc @@ -27,9 +27,9 @@ extern "C" { #include "platform.h" #include "target.h" #include "build/version.h" - #include "config/parameter_group.h" + #include "pg/pg.h" #include "config/feature.h" - #include "config/parameter_group_ids.h" + #include "pg/pg_ids.h" #include "drivers/buf_writer.h" #include "drivers/vtx_common.h" #include "fc/config.h" diff --git a/src/test/unit/flight_failsafe_unittest.cc b/src/test/unit/flight_failsafe_unittest.cc index 07a5b456d0..96bc03abfe 100644 --- a/src/test/unit/flight_failsafe_unittest.cc +++ b/src/test/unit/flight_failsafe_unittest.cc @@ -23,7 +23,7 @@ extern "C" { #include "build/debug.h" - #include "config/parameter_group_ids.h" + #include "pg/pg_ids.h" #include "platform.h" diff --git a/src/test/unit/flight_imu_unittest.cc b/src/test/unit/flight_imu_unittest.cc index 401f52fb3e..1945c70d9c 100644 --- a/src/test/unit/flight_imu_unittest.cc +++ b/src/test/unit/flight_imu_unittest.cc @@ -27,7 +27,7 @@ extern "C" { #include "common/maths.h" #include "config/feature.h" - #include "config/parameter_group_ids.h" + #include "pg/pg_ids.h" #include "drivers/accgyro/accgyro.h" #include "drivers/compass/compass.h" diff --git a/src/test/unit/ledstrip_unittest.cc b/src/test/unit/ledstrip_unittest.cc index 5fc1e91f91..a31ac7f1e3 100644 --- a/src/test/unit/ledstrip_unittest.cc +++ b/src/test/unit/ledstrip_unittest.cc @@ -27,7 +27,7 @@ extern "C" { #include "common/axis.h" #include "common/color.h" - #include "config/parameter_group_ids.h" + #include "pg/pg_ids.h" #include "drivers/io.h" #include "drivers/light_ws2811strip.h" diff --git a/src/test/unit/osd_unittest.cc b/src/test/unit/osd_unittest.cc index 718f752966..040b2b44d7 100644 --- a/src/test/unit/osd_unittest.cc +++ b/src/test/unit/osd_unittest.cc @@ -27,7 +27,7 @@ extern "C" { #include "blackbox/blackbox.h" - #include "config/parameter_group_ids.h" + #include "pg/pg_ids.h" #include "common/time.h" diff --git a/src/test/unit/parameter_group.ld b/src/test/unit/pg.ld similarity index 100% rename from src/test/unit/parameter_group.ld rename to src/test/unit/pg.ld diff --git a/src/test/unit/parameter_groups_unittest.cc b/src/test/unit/pg_unittest.cc similarity index 96% rename from src/test/unit/parameter_groups_unittest.cc rename to src/test/unit/pg_unittest.cc index 211109fa3d..415cc5dd62 100644 --- a/src/test/unit/parameter_groups_unittest.cc +++ b/src/test/unit/pg_unittest.cc @@ -24,8 +24,8 @@ extern "C" { #include #include "build/debug.h" - #include "config/parameter_group.h" - #include "config/parameter_group_ids.h" + #include "pg/pg.h" + #include "pg/pg_ids.h" #include "flight/mixer.h" diff --git a/src/test/unit/rc_controls_unittest.cc b/src/test/unit/rc_controls_unittest.cc index 7538bbc6e4..3ade1434ee 100644 --- a/src/test/unit/rc_controls_unittest.cc +++ b/src/test/unit/rc_controls_unittest.cc @@ -27,8 +27,8 @@ extern "C" { #include "common/axis.h" #include "common/bitarray.h" - #include "config/parameter_group.h" - #include "config/parameter_group_ids.h" + #include "pg/pg.h" + #include "pg/pg_ids.h" #include "blackbox/blackbox.h" #include "blackbox/blackbox_fielddefs.h" diff --git a/src/test/unit/rcdevice_unittest.cc b/src/test/unit/rcdevice_unittest.cc index d514034c9c..d3abc7a0f6 100644 --- a/src/test/unit/rcdevice_unittest.cc +++ b/src/test/unit/rcdevice_unittest.cc @@ -30,8 +30,8 @@ extern "C" { #include "common/utils.h" #include "common/streambuf.h" - #include "config/parameter_group.h" - #include "config/parameter_group_ids.h" + #include "pg/pg.h" + #include "pg/pg_ids.h" #include "fc/rc_controls.h" #include "fc/rc_modes.h" diff --git a/src/test/unit/rx_crsf_unittest.cc b/src/test/unit/rx_crsf_unittest.cc index a0616b21fb..bea799d099 100644 --- a/src/test/unit/rx_crsf_unittest.cc +++ b/src/test/unit/rx_crsf_unittest.cc @@ -26,8 +26,8 @@ extern "C" { #include "build/debug.h" - #include "config/parameter_group.h" - #include "config/parameter_group_ids.h" + #include "pg/pg.h" + #include "pg/pg_ids.h" #include "common/crc.h" #include "common/utils.h" diff --git a/src/test/unit/rx_ibus_unittest.cc b/src/test/unit/rx_ibus_unittest.cc index bf6fb3f10a..75e579047f 100644 --- a/src/test/unit/rx_ibus_unittest.cc +++ b/src/test/unit/rx_ibus_unittest.cc @@ -19,7 +19,7 @@ extern "C" { #include -#include "config/parameter_group.h" +#include "pg/pg.h" #include "drivers/serial.h" #include "drivers/time.h" #include "io/serial.h" diff --git a/src/test/unit/rx_ranges_unittest.cc b/src/test/unit/rx_ranges_unittest.cc index a93b8e8a34..b2ab9df100 100644 --- a/src/test/unit/rx_ranges_unittest.cc +++ b/src/test/unit/rx_ranges_unittest.cc @@ -25,7 +25,7 @@ extern "C" { #include "drivers/io.h" #include "common/maths.h" - #include "config/parameter_group_ids.h" + #include "pg/pg_ids.h" #include "fc/rc_controls.h" #include "fc/rc_modes.h" #include "rx/rx.h" diff --git a/src/test/unit/rx_rx_unittest.cc b/src/test/unit/rx_rx_unittest.cc index e2cd6fc79b..3505b6c791 100644 --- a/src/test/unit/rx_rx_unittest.cc +++ b/src/test/unit/rx_rx_unittest.cc @@ -29,8 +29,8 @@ extern "C" { #include "common/maths.h" #include "common/utils.h" #include "config/feature.h" - #include "config/parameter_group.h" - #include "config/parameter_group_ids.h" + #include "pg/pg.h" + #include "pg/pg_ids.h" #include "io/beeper.h" boxBitmask_t rcModeActivationMask; diff --git a/src/test/unit/telemetry_crsf_msp_unittest.cc b/src/test/unit/telemetry_crsf_msp_unittest.cc index 843f1ebaa2..2dc71a6756 100644 --- a/src/test/unit/telemetry_crsf_msp_unittest.cc +++ b/src/test/unit/telemetry_crsf_msp_unittest.cc @@ -35,8 +35,8 @@ extern "C" { #include "common/streambuf.h" #include "common/typeconversion.h" - #include "config/parameter_group.h" - #include "config/parameter_group_ids.h" + #include "pg/pg.h" + #include "pg/pg_ids.h" #include "drivers/nvic.h" #include "drivers/serial.h" diff --git a/src/test/unit/telemetry_crsf_unittest.cc b/src/test/unit/telemetry_crsf_unittest.cc index 07e235fb84..1a128ca483 100644 --- a/src/test/unit/telemetry_crsf_unittest.cc +++ b/src/test/unit/telemetry_crsf_unittest.cc @@ -34,8 +34,8 @@ extern "C" { #include "common/printf.h" #include "common/typeconversion.h" - #include "config/parameter_group.h" - #include "config/parameter_group_ids.h" + #include "pg/pg.h" + #include "pg/pg_ids.h" #include "drivers/serial.h" #include "drivers/system.h" diff --git a/src/test/unit/telemetry_hott_unittest.cc b/src/test/unit/telemetry_hott_unittest.cc index ec5df96c0e..8a00bce26d 100644 --- a/src/test/unit/telemetry_hott_unittest.cc +++ b/src/test/unit/telemetry_hott_unittest.cc @@ -29,8 +29,8 @@ extern "C" { #include "common/axis.h" #include "common/gps_conversion.h" - #include "config/parameter_group.h" - #include "config/parameter_group_ids.h" + #include "pg/pg.h" + #include "pg/pg_ids.h" #include "drivers/system.h" #include "drivers/serial.h" diff --git a/src/test/unit/telemetry_ibus_unittest.cc b/src/test/unit/telemetry_ibus_unittest.cc index bded7e50d8..d343c298ac 100644 --- a/src/test/unit/telemetry_ibus_unittest.cc +++ b/src/test/unit/telemetry_ibus_unittest.cc @@ -21,7 +21,7 @@ extern "C" { #include #include "common/utils.h" -#include "config/parameter_group.h" +#include "pg/pg.h" #include "drivers/serial.h" #include "io/serial.h" #include "fc/rc_controls.h"