Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 04:45:24 +03:00
Code Issues Wiki Activity

Removal of USE_PARAMETER_GROUPS 1

Browse source
This commit is contained in:
Martin Budden 2017-03-09 10:44:23 +00:00
parent d48398d15c
commit 1964362dce
19 changed files with 48 additions and 429 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/cms/cms_menu_imu.c
View file

@ -37,17 +37,19 @@
#include "common/utils.h" #include "common/utils.h"
#include "config/config_profile.h"
#include "config/feature.h"
#include "config/parameter_group.h"
#include "fc/config.h" #include "fc/config.h"
#include "fc/controlrate_profile.h"
#include "fc/rc_controls.h" #include "fc/rc_controls.h"
#include "fc/runtime_config.h" #include "fc/runtime_config.h"
#include "flight/pid.h" #include "flight/pid.h"
#include "config/config_master.h" #include "sensors/gyro.h"
#include "config/config_profile.h"
#include "config/feature.h"
#include "config/parameter_group.h"
#include "config/parameter_group_ids.h"
// //
// PID // PID

21
src/main/config/config_eeprom.c
View file

@ -26,14 +26,18 @@
#include "common/maths.h" #include "common/maths.h"
#include "drivers/light_led.h"
#include "config/config_eeprom.h" #include "config/config_eeprom.h"
#include "config/config_streamer.h" #include "config/config_streamer.h"
#include "config/config_master.h"
#include "config/parameter_group.h" #include "config/parameter_group.h"
#include "drivers/system.h" #include "drivers/system.h"
#include "fc/config.h" #include "fc/config.h"
#include "fc/rc_adjustments.h"
#include "flight/pid.h"
extern uint8_t __config_start; // configured via linker script when building binaries. extern uint8_t __config_start; // configured via linker script when building binaries.
extern uint8_t __config_end; extern uint8_t __config_end;
@ -115,11 +119,6 @@ bool isEEPROMContentValid(void)
uint16_t crc = CRC_START_VALUE; uint16_t crc = CRC_START_VALUE;
crc = crc16_ccitt_update(crc, header, sizeof(*header)); crc = crc16_ccitt_update(crc, header, sizeof(*header));
p += sizeof(*header); p += sizeof(*header);
#ifndef USE_PARAMETER_GROUPS
// include the transitional masterConfig record
crc = crc16_ccitt_update(crc, p, sizeof(masterConfig));
p += sizeof(masterConfig);
#endif
for (;;) { for (;;) {
const configRecord_t *record = (const configRecord_t *)p; const configRecord_t *record = (const configRecord_t *)p;
@ -166,9 +165,6 @@ static const configRecord_t *findEEPROM(const pgRegistry_t *reg, configRecordFla
{ {
const uint8_t *p = &__config_start; const uint8_t *p = &__config_start;
p += sizeof(configHeader_t); // skip header p += sizeof(configHeader_t); // skip header
#ifndef USE_PARAMETER_GROUPS
p += sizeof(master_t); // skip the transitional master_t record
#endif
while (true) { while (true) {
const configRecord_t *record = (const configRecord_t *)p; const configRecord_t *record = (const configRecord_t *)p;
if (record->size == 0 if (record->size == 0
@ -189,13 +185,6 @@ static const configRecord_t *findEEPROM(const pgRegistry_t *reg, configRecordFla
// but each PG is loaded/initialized exactly once and in defined order. // but each PG is loaded/initialized exactly once and in defined order.
bool loadEEPROM(void) bool loadEEPROM(void)
{ {
#ifndef USE_PARAMETER_GROUPS
// read in the transitional masterConfig record
const uint8_t *p = &__config_start;
p += sizeof(configHeader_t); // skip header
masterConfig = *(master_t*)p;
#endif
PG_FOREACH(reg) { PG_FOREACH(reg) {
configRecordFlags_e cls_start, cls_end; configRecordFlags_e cls_start, cls_end;
if (pgIsSystem(reg)) { if (pgIsSystem(reg)) {

2
src/main/config/config_eeprom.h
View file

@ -20,7 +20,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#define EEPROM_CONF_VERSION 157 #define EEPROM_CONF_VERSION 158
bool isEEPROMContentValid(void); bool isEEPROMContentValid(void);
bool loadEEPROM(void); bool loadEEPROM(void);

333
src/main/config/config_master.h
View file

@ -1,333 +0,0 @@
/*
* This file is part of Cleanflight.
*
* Cleanflight is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Cleanflight is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Cleanflight. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <stdlib.h>
#include "config/config_profile.h"
#include "config/feature.h"
#include "blackbox/blackbox.h"
#include "cms/cms.h"
#include "drivers/adc.h"
#include "drivers/rx_pwm.h"
#include "drivers/sound_beeper.h"
#include "drivers/sonar_hcsr04.h"
#include "drivers/sdcard.h"
#include "drivers/vcd.h"
#include "drivers/light_led.h"
#include "drivers/flash.h"
#include "drivers/display.h"
#include "drivers/serial.h"
#include "fc/config.h"
#include "fc/controlrate_profile.h"
#include "fc/rc_adjustments.h"
#include "fc/rc_controls.h"
#include "fc/fc_core.h"
#include "flight/altitudehold.h"
#include "flight/failsafe.h"
#include "flight/mixer.h"
#include "flight/servos.h"
#include "flight/imu.h"
#include "flight/navigation.h"
#include "flight/pid.h"
#include "io/beeper.h"
#include "io/gimbal.h"
#include "io/gps.h"
#include "io/ledstrip.h"
#include "io/osd.h"
#include "io/serial.h"
#include "io/servos.h"
#include "io/transponder_ir.h"
#include "io/vtx.h"
#include "rx/rx.h"
#include "telemetry/telemetry.h"
#include "sensors/sensors.h"
#include "sensors/gyro.h"
#include "sensors/acceleration.h"
#include "sensors/boardalignment.h"
#include "sensors/barometer.h"
#include "sensors/battery.h"
#include "sensors/compass.h"
#ifndef USE_PARAMETER_GROUPS
#define featureConfig(x) (&masterConfig.featureConfig)
#define systemConfig(x) (&masterConfig.systemConfig)
#define motorConfig(x) (&masterConfig.motorConfig)
#define flight3DConfig(x) (&masterConfig.flight3DConfig)
#define servoConfig(x) (&masterConfig.servoConfig)
#define servoMixerConfig(x) (&masterConfig.servoMixerConfig)
#define gimbalConfig(x) (&masterConfig.gimbalConfig)
#define boardAlignment(x) (&masterConfig.boardAlignment)
#define imuConfig(x) (&masterConfig.imuConfig)
#define gyroConfig(x) (&masterConfig.gyroConfig)
#define compassConfig(x) (&masterConfig.compassConfig)
#define accelerometerConfig(x) (&masterConfig.accelerometerConfig)
#define barometerConfig(x) (&masterConfig.barometerConfig)
#define throttleCorrectionConfig(x) (&masterConfig.throttleCorrectionConfig)
#define batteryConfig(x) (&masterConfig.batteryConfig)
#define rcControlsConfig(x) (&masterConfig.rcControlsConfig)
#define navigationConfig(x) (&masterConfig.navigationConfig)
#define gpsConfig(x) (&masterConfig.gpsConfig)
#define rxConfig(x) (&masterConfig.rxConfig)
#define armingConfig(x) (&masterConfig.armingConfig)
#define mixerConfig(x) (&masterConfig.mixerConfig)
#define airplaneConfig(x) (&masterConfig.airplaneConfig)
#define failsafeConfig(x) (&masterConfig.failsafeConfig)
#define serialPinConfig(x) (&masterConfig.serialPinConfig)
#define serialConfig(x) (&masterConfig.serialConfig)
#define telemetryConfig(x) (&masterConfig.telemetryConfig)
#define ibusTelemetryConfig(x) (&masterConfig.telemetryConfig)
#define ppmConfig(x) (&masterConfig.ppmConfig)
#define pwmConfig(x) (&masterConfig.pwmConfig)
#define adcConfig(x) (&masterConfig.adcConfig)
#define beeperDevConfig(x) (&masterConfig.beeperDevConfig)
#define sonarConfig(x) (&masterConfig.sonarConfig)
#define ledStripConfig(x) (&masterConfig.ledStripConfig)
#define statusLedConfig(x) (&masterConfig.statusLedConfig)
#define osdConfig(x) (&masterConfig.osdConfig)
#define vcdProfile(x) (&masterConfig.vcdProfile)
#define sdcardConfig(x) (&masterConfig.sdcardConfig)
#define blackboxConfig(x) (&masterConfig.blackboxConfig)
#define flashConfig(x) (&masterConfig.flashConfig)
#define pidConfig(x) (&masterConfig.pidConfig)
#define adjustmentProfile(x) (&masterConfig.adjustmentProfile)
#define modeActivationProfile(x) (&masterConfig.modeActivationProfile)
#define servoProfile(x) (&masterConfig.servoProfile)
#define customMotorMixer(i) (&masterConfig.customMotorMixer[i])
#define customServoMixers(i) (&masterConfig.customServoMixer[i])
#define displayPortProfileMsp(x) (&masterConfig.displayPortProfileMsp)
#define displayPortProfileMax7456(x) (&masterConfig.displayPortProfileMax7456)
#define displayPortProfileOled(x) (&masterConfig.displayPortProfileOled)
#define vtxConfig(x) (&masterConfig.vtxConfig)
#define beeperConfig(x) (&masterConfig.beeperConfig)
#define transponderConfig(x) (&masterConfig.transponderConfig)
#define featureConfigMutable(x) (&masterConfig.featureConfig)
#define systemConfigMutable(x) (&masterConfig.systemConfig)
#define motorConfigMutable(x) (&masterConfig.motorConfig)
#define flight3DConfigMutable(x) (&masterConfig.flight3DConfig)
#define servoConfigMutable(x) (&masterConfig.servoConfig)
#define servoMixerConfigMutable(x) (&masterConfig.servoMixerConfig)
#define gimbalConfigMutable(x) (&masterConfig.gimbalConfig)
#define boardAlignmentMutable(x) (&masterConfig.boardAlignment)
#define imuConfigMutable(x) (&masterConfig.imuConfig)
#define gyroConfigMutable(x) (&masterConfig.gyroConfig)
#define compassConfigMutable(x) (&masterConfig.compassConfig)
#define accelerometerConfigMutable(x) (&masterConfig.accelerometerConfig)
#define barometerConfigMutable(x) (&masterConfig.barometerConfig)
#define throttleCorrectionConfigMutable(x) (&masterConfig.throttleCorrectionConfig)
#define batteryConfigMutable(x) (&masterConfig.batteryConfig)
#define rcControlsConfigMutable(x) (&masterConfig.rcControlsConfig)
#define navigationConfigMutable(x) (&masterConfig.navigationConfig)
#define gpsConfigMutable(x) (&masterConfig.gpsConfig)
#define rxConfigMutable(x) (&masterConfig.rxConfig)
#define armingConfigMutable(x) (&masterConfig.armingConfig)
#define mixerConfigMutable(x) (&masterConfig.mixerConfig)
#define airplaneConfigMutable(x) (&masterConfig.airplaneConfig)
#define failsafeConfigMutable(x) (&masterConfig.failsafeConfig)
#define serialConfigMutable(x) (&masterConfig.serialConfig)
#define telemetryConfigMutable(x) (&masterConfig.telemetryConfig)
#define ibusTelemetryConfigMutable(x) (&masterConfig.telemetryConfig)
#define ppmConfigMutable(x) (&masterConfig.ppmConfig)
#define pwmConfigMutable(x) (&masterConfig.pwmConfig)
#define adcConfigMutable(x) (&masterConfig.adcConfig)
#define beeperDevConfigMutable(x) (&masterConfig.beeperDevConfig)
#define sonarConfigMutable(x) (&masterConfig.sonarConfig)
#define ledStripConfigMutable(x) (&masterConfig.ledStripConfig)
#define statusLedConfigMutable(x) (&masterConfig.statusLedConfig)
#define osdConfigMutable(x) (&masterConfig.osdConfig)
#define vcdProfileMutable(x) (&masterConfig.vcdProfile)
#define sdcardConfigMutable(x) (&masterConfig.sdcardConfig)
#define blackboxConfigMutable(x) (&masterConfig.blackboxConfig)
#define flashConfigMutable(x) (&masterConfig.flashConfig)
#define pidConfigMutable(x) (&masterConfig.pidConfig)
#define adjustmentProfileMutable(x) (&masterConfig.adjustmentProfile)
#define modeActivationProfileMutable(x) (&masterConfig.modeActivationProfile)
#define servoProfileMutable(x) (&masterConfig.servoProfile)
#define customMotorMixerMutable(i) (&masterConfig.customMotorMixer[i])
#define customServoMixersMutable(i) (&masterConfig.customServoMixer[i])
#define displayPortProfileMspMutable(x) (&masterConfig.displayPortProfileMsp)
#define displayPortProfileMax7456Mutable(x) (&masterConfig.displayPortProfileMax7456)
#define displayPortProfileOledMutable(x) (&masterConfig.displayPortProfileOled)
#define vtxConfigMutable(x) (&masterConfig.vtxConfig)
#define beeperConfigMutable(x) (&masterConfig.beeperConfig)
#define transponderConfigMutable(x) (&masterConfig.transponderConfig)
#define servoParams(i) (&servoProfile()->servoConf[i])
#define adjustmentRanges(i) (&adjustmentProfile()->adjustmentRanges[i])
#define rxFailsafeChannelConfigs(i) (&masterConfig.rxConfig.failsafe_channel_configurations[i])
#define modeActivationConditions(i) (&masterConfig.modeActivationProfile.modeActivationConditions[i])
#define controlRateProfiles(i) (&masterConfig.controlRateProfile[i])
#define pidProfiles(i) (&masterConfig.profile[i].pidProfile)
#define servoParamsMutable(i) (&servoProfile()->servoConf[i])
#define adjustmentRangesMutable(i) (&masterConfig.adjustmentProfile.adjustmentRanges[i])
#define rxFailsafeChannelConfigsMutable(i) (&masterConfig.rxConfig.>failsafe_channel_configurations[i])
#define modeActivationConditionsMutable(i) (&masterConfig.modeActivationProfile.modeActivationConditions[i])
#define controlRateProfilesMutable(i) (&masterConfig.controlRateProfile[i])
#define pidProfilesMutable(i) (&masterConfig.profile[i].pidProfile)
// System-wide
typedef struct master_s {
uint8_t version;
uint16_t size;
uint8_t magic_be; // magic number, should be 0xBE
featureConfig_t featureConfig;
systemConfig_t systemConfig;
// motor/esc/servo related stuff
motorMixer_t customMotorMixer[MAX_SUPPORTED_MOTORS];
motorConfig_t motorConfig;
flight3DConfig_t flight3DConfig;
#ifdef USE_SERVOS
servoConfig_t servoConfig;
servoMixer_t customServoMixer[MAX_SERVO_RULES];
// Servo-related stuff
servoProfile_t servoProfile;
// gimbal-related configuration
gimbalConfig_t gimbalConfig;
#endif
boardAlignment_t boardAlignment;
imuConfig_t imuConfig;
pidConfig_t pidConfig;
gyroConfig_t gyroConfig;
compassConfig_t compassConfig;
accelerometerConfig_t accelerometerConfig;
barometerConfig_t barometerConfig;
throttleCorrectionConfig_t throttleCorrectionConfig;
batteryConfig_t batteryConfig;
// Radio/ESC-related configuration
rcControlsConfig_t rcControlsConfig;
#ifdef GPS
navigationConfig_t navigationConfig;
gpsConfig_t gpsConfig;
#endif
rxConfig_t rxConfig;
armingConfig_t armingConfig;
// mixer-related configuration
mixerConfig_t mixerConfig;
airplaneConfig_t airplaneConfig;
failsafeConfig_t failsafeConfig;
serialPinConfig_t serialPinConfig;
serialConfig_t serialConfig;
telemetryConfig_t telemetryConfig;
statusLedConfig_t statusLedConfig;
#ifdef USE_PPM
ppmConfig_t ppmConfig;
#endif
#ifdef USE_PWM
pwmConfig_t pwmConfig;
#endif
#ifdef USE_ADC
adcConfig_t adcConfig;
#endif
#ifdef BEEPER
beeperDevConfig_t beeperDevConfig;
#endif
#ifdef SONAR
sonarConfig_t sonarConfig;
#endif
#ifdef LED_STRIP
ledStripConfig_t ledStripConfig;
#endif
#ifdef TRANSPONDER
transponderConfig_t transponderConfig;
#endif
#ifdef OSD
osdConfig_t osdConfig;
#endif
#ifdef USE_MAX7456
vcdProfile_t vcdProfile;
#endif
#ifdef USE_MSP_DISPLAYPORT
displayPortProfile_t displayPortProfileMsp;
#endif
#ifdef USE_MAX7456
displayPortProfile_t displayPortProfileMax7456;
# endif
#ifdef USE_SDCARD
sdcardConfig_t sdcardConfig;
#endif
profile_t profile[MAX_PROFILE_COUNT];
controlRateConfig_t controlRateProfile[CONTROL_RATE_PROFILE_COUNT];
modeActivationProfile_t modeActivationProfile;
adjustmentProfile_t adjustmentProfile;
#if defined(USE_RTC6705) || defined(VTX)
vtxConfig_t vtxConfig;
#endif
#ifdef BLACKBOX
blackboxConfig_t blackboxConfig;
#endif
#ifdef USE_FLASHFS
flashConfig_t flashConfig;
#endif
beeperConfig_t beeperConfig;
uint8_t chk; // XOR checksum
/*
do not add properties after the MAGIC_EF and CHK
as it is assumed to exist at length-2 and length-1
*/
} master_t;
extern master_t masterConfig;
void createDefaultConfig(master_t *config);
#endif // USE_PARAMETER_GROUPS

29
src/main/config/parameter_group.h
View file

@ -100,7 +100,6 @@ extern const uint8_t __pg_resetdata_end[];
} while(0) \ } while(0) \
/**/ /**/
#ifdef USE_PARAMETER_GROUPS
// Declare system config // Declare system config
#define PG_DECLARE(_type, _name) \ #define PG_DECLARE(_type, _name) \
extern _type _name ## _System; \ extern _type _name ## _System; \
@ -126,21 +125,7 @@ extern const uint8_t __pg_resetdata_end[];
struct _dummy \ struct _dummy \
/**/ /**/
#else
#define PG_DECLARE(_type, _name) \
extern _type _name ## _System
#define PG_DECLARE_ARRAY(_type, _size, _name) \
extern _type _name ## _SystemArray[_size]
// Declare profile config
#define PG_DECLARE_PROFILE(_type, _name) \
extern _type *_name ## _ProfileCurrent
#endif // USE_PARAMETER_GROUPS
#ifdef USE_PARAMETER_GROUPS
// Register system config // Register system config
#define PG_REGISTER_I(_type, _name, _pgn, _version, _reset) \ #define PG_REGISTER_I(_type, _name, _pgn, _version, _reset) \
_type _name ## _System; \ _type _name ## _System; \
@ -154,10 +139,6 @@ extern const uint8_t __pg_resetdata_end[];
_reset, \ _reset, \
} \ } \
/**/ /**/
#else
#define PG_REGISTER_I(_type, _name, _pgn, _version, _reset) \
_type _name ## _System
#endif
#define PG_REGISTER(_type, _name, _pgn, _version) \ #define PG_REGISTER(_type, _name, _pgn, _version) \
PG_REGISTER_I(_type, _name, _pgn, _version, .reset = {.ptr = 0}) \ PG_REGISTER_I(_type, _name, _pgn, _version, .reset = {.ptr = 0}) \
@ -173,7 +154,6 @@ extern const uint8_t __pg_resetdata_end[];
PG_REGISTER_I(_type, _name, _pgn, _version, .reset = {.ptr = (void*)&pgResetTemplate_ ## _name}) \ PG_REGISTER_I(_type, _name, _pgn, _version, .reset = {.ptr = (void*)&pgResetTemplate_ ## _name}) \
/**/ /**/
#ifdef USE_PARAMETER_GROUPS
// Register system config array // Register system config array
#define PG_REGISTER_ARRAY_I(_type, _size, _name, _pgn, _version, _reset) \ #define PG_REGISTER_ARRAY_I(_type, _size, _name, _pgn, _version, _reset) \
_type _name ## _SystemArray[_size]; \ _type _name ## _SystemArray[_size]; \
@ -186,10 +166,6 @@ extern const uint8_t __pg_resetdata_end[];
_reset, \ _reset, \
} \ } \
/**/ /**/
#else
#define PG_REGISTER_ARRAY_I(_type, _size, _name, _pgn, _version, _reset) \
_type _name ## _SystemArray[_size]
#endif
#define PG_REGISTER_ARRAY(_type, _size, _name, _pgn, _version) \ #define PG_REGISTER_ARRAY(_type, _size, _name, _pgn, _version) \
PG_REGISTER_ARRAY_I(_type, _size, _name, _pgn, _version, .reset = {.ptr = 0}) \ PG_REGISTER_ARRAY_I(_type, _size, _name, _pgn, _version, .reset = {.ptr = 0}) \
@ -216,7 +192,6 @@ extern const uint8_t __pg_resetdata_end[];
_type *_name ## _ProfileCurrent; _type *_name ## _ProfileCurrent;
#endif #endif
#ifdef USE_PARAMETER_GROUPS
// register profile config // register profile config
#define PG_REGISTER_PROFILE_I(_type, _name, _pgn, _version, _reset) \ #define PG_REGISTER_PROFILE_I(_type, _name, _pgn, _version, _reset) \
STATIC_UNIT_TESTED _type _name ## _Storage[MAX_PROFILE_COUNT]; \ STATIC_UNIT_TESTED _type _name ## _Storage[MAX_PROFILE_COUNT]; \
@ -230,10 +205,6 @@ extern const uint8_t __pg_resetdata_end[];
_reset, \ _reset, \
} \ } \
/**/ /**/
#else
#define PG_REGISTER_PROFILE_I(_type, _name, _pgn, _version, _reset) \
STATIC_UNIT_TESTED _type _name ## _Storage[MAX_PROFILE_COUNT]
#endif
#define PG_REGISTER_PROFILE(_type, _name, _pgn, _version) \ #define PG_REGISTER_PROFILE(_type, _name, _pgn, _version) \
PG_REGISTER_PROFILE_I(_type, _name, _pgn, _version, .reset = {.ptr = 0}) \ PG_REGISTER_PROFILE_I(_type, _name, _pgn, _version, .reset = {.ptr = 0}) \

4
src/main/config/parameter_group_ids.h
View file

@ -15,10 +15,6 @@
* along with Cleanflight. If not, see <http://www.gnu.org/licenses/>. * along with Cleanflight. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef USE_PARAMETER_GROUPS
#include "config/config_master.h"
#endif
// FC configuration // FC configuration
#define PG_FAILSAFE_CONFIG 1 // struct OK #define PG_FAILSAFE_CONFIG 1 // struct OK
#define PG_BOARD_ALIGNMENT 2 // struct OK #define PG_BOARD_ALIGNMENT 2 // struct OK

4
src/main/drivers/serial_softserial.c
View file

@ -34,8 +34,6 @@
#include "common/utils.h" #include "common/utils.h"
#include "config/config_master.h"
#include "nvic.h" #include "nvic.h"
#include "system.h" #include "system.h"
#include "io.h" #include "io.h"
@ -44,6 +42,8 @@
#include "serial.h" #include "serial.h"
#include "serial_softserial.h" #include "serial_softserial.h"
#include "fc/config.h" //!!TODO remove this dependency
#define RX_TOTAL_BITS 10 #define RX_TOTAL_BITS 10
#define TX_TOTAL_BITS 10 #define TX_TOTAL_BITS 10

3
src/main/fc/cli.c
View file

@ -48,7 +48,6 @@ extern uint8_t __config_end;
#include "common/typeconversion.h" #include "common/typeconversion.h"
#include "common/utils.h" #include "common/utils.h"
#include "config/config_master.h"
#include "config/config_eeprom.h" #include "config/config_eeprom.h"
#include "config/config_profile.h" #include "config/config_profile.h"
#include "config/feature.h" #include "config/feature.h"
@ -77,10 +76,12 @@ extern uint8_t __config_end;
#include "fc/cli.h" #include "fc/cli.h"
#include "fc/config.h" #include "fc/config.h"
#include "fc/controlrate_profile.h" #include "fc/controlrate_profile.h"
#include "fc/fc_core.h"
#include "fc/rc_adjustments.h" #include "fc/rc_adjustments.h"
#include "fc/rc_controls.h" #include "fc/rc_controls.h"
#include "fc/runtime_config.h" #include "fc/runtime_config.h"
#include "flight/altitudehold.h"
#include "flight/failsafe.h" #include "flight/failsafe.h"
#include "flight/imu.h" #include "flight/imu.h"
#include "flight/mixer.h" #include "flight/mixer.h"

13
src/main/fc/config.c
View file

@ -35,7 +35,6 @@
#include "common/maths.h" #include "common/maths.h"
#include "config/config_eeprom.h" #include "config/config_eeprom.h"
#include "config/config_master.h"
#include "config/config_profile.h" #include "config/config_profile.h"
#include "config/feature.h" #include "config/feature.h"
#include "config/parameter_group.h" #include "config/parameter_group.h"
@ -44,6 +43,7 @@
#include "drivers/accgyro.h" #include "drivers/accgyro.h"
#include "drivers/compass.h" #include "drivers/compass.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/light_led.h"
#include "drivers/light_ws2811strip.h" #include "drivers/light_ws2811strip.h"
#include "drivers/max7456.h" #include "drivers/max7456.h"
#include "drivers/pwm_esc_detect.h" #include "drivers/pwm_esc_detect.h"
@ -53,14 +53,18 @@
#include "drivers/sdcard.h" #include "drivers/sdcard.h"
#include "drivers/sensor.h" #include "drivers/sensor.h"
#include "drivers/serial.h" #include "drivers/serial.h"
#include "drivers/sonar_hcsr04.h"
#include "drivers/sound_beeper.h" #include "drivers/sound_beeper.h"
#include "drivers/system.h" #include "drivers/system.h"
#include "drivers/timer.h" #include "drivers/timer.h"
#include "drivers/vcd.h" #include "drivers/vcd.h"
#include "fc/config.h" #include "fc/config.h"
#include "fc/rc_controls.h" #include "fc/controlrate_profile.h"
#include "fc/fc_core.h"
#include "fc/fc_rc.h" #include "fc/fc_rc.h"
#include "fc/rc_adjustments.h"
#include "fc/rc_controls.h"
#include "fc/runtime_config.h" #include "fc/runtime_config.h"
#include "flight/altitudehold.h" #include "flight/altitudehold.h"
@ -94,9 +98,6 @@
#include "telemetry/telemetry.h" #include "telemetry/telemetry.h"
#ifndef USE_PARAMETER_GROUPS
master_t masterConfig; // master config struct with data independent from profiles
#endif
pidProfile_t *currentPidProfile; pidProfile_t *currentPidProfile;
#ifndef DEFAULT_FEATURES #ifndef DEFAULT_FEATURES
@ -1272,7 +1273,7 @@ void validateAndFixConfig(void)
} }
#else #else
if (!isSerialConfigValid(serialConfig())) { if (!isSerialConfigValid(serialConfig())) {
pgResetFn_serialPinConfig(serialConfigMutable()); pgResetFn_serialConfig(serialConfigMutable());
} }
#endif #endif

6
src/main/fc/config.h
View file

@ -117,11 +117,5 @@ bool canSoftwareSerialBeUsed(void);
uint16_t getCurrentMinthrottle(void); uint16_t getCurrentMinthrottle(void);
void resetConfigs(void); void resetConfigs(void);
#ifdef USE_PARAMETER_GROUPS
void targetConfiguration(void); void targetConfiguration(void);
void targetValidateConfiguration(void); void targetValidateConfiguration(void);
#else
struct master_s;
void targetConfiguration(struct master_s *config);
void targetValidateConfiguration(struct master_s *config);
#endif

2
src/main/fc/fc_msp.c
View file

@ -33,7 +33,6 @@
#include "common/maths.h" #include "common/maths.h"
#include "common/streambuf.h" #include "common/streambuf.h"
#include "config/config_master.h"
#include "config/config_eeprom.h" #include "config/config_eeprom.h"
#include "config/config_profile.h" #include "config/config_profile.h"
#include "config/feature.h" #include "config/feature.h"
@ -56,6 +55,7 @@
#include "drivers/vtx_soft_spi_rtc6705.h" #include "drivers/vtx_soft_spi_rtc6705.h"
#include "fc/config.h" #include "fc/config.h"
#include "fc/controlrate_profile.h"
#include "fc/fc_core.h" #include "fc/fc_core.h"
#include "fc/fc_msp.h" #include "fc/fc_msp.h"
#include "fc/fc_rc.h" #include "fc/fc_rc.h"

2
src/main/flight/pid.c
View file

@ -76,7 +76,6 @@ PG_RESET_TEMPLATE(pidConfig_t, pidConfig,
PG_REGISTER_ARRAY_WITH_RESET_FN(pidProfile_t, MAX_PROFILE_COUNT, pidProfiles, PG_PID_PROFILE, 0); PG_REGISTER_ARRAY_WITH_RESET_FN(pidProfile_t, MAX_PROFILE_COUNT, pidProfiles, PG_PID_PROFILE, 0);
#ifdef USE_PARAMETER_GROUPS
void resetPidProfile(pidProfile_t *pidProfile) void resetPidProfile(pidProfile_t *pidProfile)
{ {
RESET_CONFIG(const pidProfile_t, pidProfile, RESET_CONFIG(const pidProfile_t, pidProfile,
@ -136,7 +135,6 @@ void pgResetFn_pidProfiles(pidProfile_t *pidProfiles)
resetPidProfile(&pidProfiles[i]); resetPidProfile(&pidProfiles[i]);
} }
} }
#endif
void pidSetTargetLooptime(uint32_t pidLooptime) void pidSetTargetLooptime(uint32_t pidLooptime)
{ {

4
src/main/io/osd.c
View file

@ -472,11 +472,7 @@ void osdDrawElements(void)
#endif // GPS #endif // GPS
} }
#ifdef USE_PARAMETER_GROUPS
void pgResetFn_osdConfig(osdConfig_t *osdProfile) void pgResetFn_osdConfig(osdConfig_t *osdProfile)
#else
void osdResetConfig(osdConfig_t *osdProfile)
#endif
{ {
osdProfile->item_pos[OSD_RSSI_VALUE] = OSD_POS(22, 0); osdProfile->item_pos[OSD_RSSI_VALUE] = OSD_POS(22, 0);
osdProfile->item_pos[OSD_MAIN_BATT_VOLTAGE] = OSD_POS(12, 0) | VISIBLE_FLAG; osdProfile->item_pos[OSD_MAIN_BATT_VOLTAGE] = OSD_POS(12, 0) | VISIBLE_FLAG;

1
src/main/io/serial.h
View file

@ -137,6 +137,7 @@ serialPortConfig_t *findNextSerialPortConfig(serialPortFunction_e function);
portSharing_e determinePortSharing(const serialPortConfig_t *portConfig, serialPortFunction_e function); portSharing_e determinePortSharing(const serialPortConfig_t *portConfig, serialPortFunction_e function);
bool isSerialPortShared(const serialPortConfig_t *portConfig, uint16_t functionMask, serialPortFunction_e sharedWithFunction); bool isSerialPortShared(const serialPortConfig_t *portConfig, uint16_t functionMask, serialPortFunction_e sharedWithFunction);
void pgResetFn_serialConfig(serialConfig_t *serialConfig); //!!TODO remove need for this
serialPortUsage_t *findSerialPortUsageByIdentifier(serialPortIdentifier_e identifier); serialPortUsage_t *findSerialPortUsageByIdentifier(serialPortIdentifier_e identifier);
int findSerialPortIndexByIdentifier(serialPortIdentifier_e identifier); int findSerialPortIndexByIdentifier(serialPortIdentifier_e identifier);
// //

4
src/main/rx/msp.h
View file

@ -17,5 +17,7 @@
#pragma once #pragma once
void rxMspInit(const rxConfig_t *rxConfig, rxRuntimeConfig_t *rxRuntimeConfig); struct rxConfig_s;
struct rxRuntimeConfig_s;
void rxMspInit(const struct rxConfig_s *rxConfig, struct rxRuntimeConfig_s *rxRuntimeConfig);
void rxMspFrameReceive(uint16_t *frame, int channelCount); void rxMspFrameReceive(uint16_t *frame, int channelCount);

7
src/main/sensors/acceleration.c
View file

@ -86,15 +86,10 @@ PG_REGISTER_WITH_RESET_FN(accelerometerConfig_t, accelerometerConfig, PG_ACCELER
void resetRollAndPitchTrims(rollAndPitchTrims_t *rollAndPitchTrims) void resetRollAndPitchTrims(rollAndPitchTrims_t *rollAndPitchTrims)
{ {
#ifdef USE_PARAMETER_GROUPS
RESET_CONFIG_2(rollAndPitchTrims_t, rollAndPitchTrims, RESET_CONFIG_2(rollAndPitchTrims_t, rollAndPitchTrims,
.values.roll = 0, .values.roll = 0,
.values.pitch = 0, .values.pitch = 0,
); );
#else
rollAndPitchTrims->values.roll = 0;
rollAndPitchTrims->values.pitch = 0;
#endif
} }
void accResetRollAndPitchTrims(void) void accResetRollAndPitchTrims(void)
@ -114,7 +109,6 @@ void accResetFlightDynamicsTrims(void)
resetFlightDynamicsTrims(&accelerometerConfigMutable()->accZero); resetFlightDynamicsTrims(&accelerometerConfigMutable()->accZero);
} }
#ifdef USE_PARAMETER_GROUPS
void pgResetFn_accelerometerConfig(accelerometerConfig_t *instance) void pgResetFn_accelerometerConfig(accelerometerConfig_t *instance)
{ {
RESET_CONFIG_2(accelerometerConfig_t, instance, RESET_CONFIG_2(accelerometerConfig_t, instance,
@ -125,7 +119,6 @@ void pgResetFn_accelerometerConfig(accelerometerConfig_t *instance)
resetRollAndPitchTrims(&instance->accelerometerTrims); resetRollAndPitchTrims(&instance->accelerometerTrims);
resetFlightDynamicsTrims(&instance->accZero); resetFlightDynamicsTrims(&instance->accZero);
} }
#endif
bool accDetect(accDev_t *dev, accelerationSensor_e accHardwareToUse) bool accDetect(accDev_t *dev, accelerationSensor_e accHardwareToUse)
{ {

14
src/main/target/BLUEJAYF4/initialisation.c
View file

@ -19,12 +19,20 @@
#include <stdint.h> #include <stdint.h>
#include "platform.h" #include "platform.h"
#include "config/feature.h"
#include "drivers/bus_i2c.h" #include "drivers/bus_i2c.h"
#include "drivers/bus_spi.h" #include "drivers/bus_spi.h"
#include "hardware_revision.h"
#include "config/config_master.h"
#include "drivers/io.h" #include "drivers/io.h"
#include "config/feature.h"
#include "fc/config.h"
#include "io/serial.h"
#include "telemetry/telemetry.h"
#include "hardware_revision.h"
void targetPreInit(void) void targetPreInit(void)
{ {

14
src/main/target/COLIBRI_RACE/i2c_bst.c
View file

@ -29,7 +29,9 @@
#include "drivers/rx_pwm.h" #include "drivers/rx_pwm.h"
#include "fc/config.h" #include "fc/config.h"
#include "fc/controlrate_profile.h"
#include "fc/fc_core.h" #include "fc/fc_core.h"
#include "fc/rc_adjustments.h"
#include "fc/rc_controls.h" #include "fc/rc_controls.h"
#include "fc/runtime_config.h" #include "fc/runtime_config.h"
@ -58,16 +60,16 @@
#include "telemetry/telemetry.h" #include "telemetry/telemetry.h"
#include "flight/mixer.h"
#include "flight/pid.h"
#include "flight/imu.h"
#include "flight/failsafe.h"
#include "flight/navigation.h"
#include "flight/altitudehold.h" #include "flight/altitudehold.h"
#include "flight/failsafe.h"
#include "flight/imu.h"
#include "flight/mixer.h"
#include "flight/navigation.h"
#include "flight/pid.h"
#include "flight/servos.h"
#include "config/config_eeprom.h" #include "config/config_eeprom.h"
#include "config/config_profile.h" #include "config/config_profile.h"
#include "config/config_master.h"
#include "config/feature.h" #include "config/feature.h"
#include "bus_bst.h" #include "bus_bst.h"

2
src/main/target/RACEBASE/config.c
View file

@ -26,8 +26,6 @@
#include "rx/rx.h" #include "rx/rx.h"
#include "config/config_master.h"
void targetConfiguration(void) void targetConfiguration(void)
{ {
rxConfigMutable()->sbus_inversion = 0; rxConfigMutable()->sbus_inversion = 0;