rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renaming 'featureEnable' / 'featureDisable' to make their use a… (#9272) 

Renaming 'featureEnable' / 'featureDisable' to make their use a bit more obvious.
This commit is contained in:
Michael Keller 2019-12-10 12:38:03 +13:00 committed by GitHub
parent 7d215e8f84 5f3d56cd2c
commit 0418fdb541
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/cms/cms_menu_ledstrip.c
View File

@ -85,11 +85,11 @@ static const void *cmsx_Ledstrip_OnExit(const OSD_Entry *self)
UNUSED(self);
if (cmsx_FeatureLedstrip) {
featureEnable(FEATURE_LED_STRIP);
featureEnableImmediate(FEATURE_LED_STRIP);
ledStripEnable();
} else {
ledStripDisable();
featureDisable(FEATURE_LED_STRIP);
featureDisableImmediate(FEATURE_LED_STRIP);
}
setLedProfile(cmsx_ledProfile);

52
src/main/config/config.c
View File

@ -219,7 +219,7 @@ static void validateAndFixConfig(void)
gpsConfig()->provider != GPS_MSP && !gpsSerial &&
#endif
true) {
featureDisable(FEATURE_GPS);
featureDisableImmediate(FEATURE_GPS);
}
for (unsigned i = 0; i < PID_PROFILE_COUNT; i++) {
@ -259,7 +259,7 @@ static void validateAndFixConfig(void)
}
if (motorConfig()->dev.motorPwmProtocol == PWM_TYPE_BRUSHED) {
featureDisable(FEATURE_3D);
featureDisableImmediate(FEATURE_3D);
if (motorConfig()->mincommand < 1000) {
motorConfigMutable()->mincommand = 1000;
@ -289,29 +289,29 @@ static void validateAndFixConfig(void)
#endif // USE_ACC
if (!(featureIsConfigured(FEATURE_RX_PARALLEL_PWM) || featureIsConfigured(FEATURE_RX_PPM) || featureIsConfigured(FEATURE_RX_SERIAL) || featureIsConfigured(FEATURE_RX_MSP) || featureIsConfigured(FEATURE_RX_SPI))) {
featureEnable(DEFAULT_RX_FEATURE);
featureEnableImmediate(DEFAULT_RX_FEATURE);
}
if (featureIsConfigured(FEATURE_RX_PPM)) {
featureDisable(FEATURE_RX_SERIAL | FEATURE_RX_PARALLEL_PWM | FEATURE_RX_MSP | FEATURE_RX_SPI);
featureDisableImmediate(FEATURE_RX_SERIAL | FEATURE_RX_PARALLEL_PWM | FEATURE_RX_MSP | FEATURE_RX_SPI);
}
if (featureIsConfigured(FEATURE_RX_MSP)) {
featureDisable(FEATURE_RX_SERIAL | FEATURE_RX_PARALLEL_PWM | FEATURE_RX_PPM | FEATURE_RX_SPI);
featureDisableImmediate(FEATURE_RX_SERIAL | FEATURE_RX_PARALLEL_PWM | FEATURE_RX_PPM | FEATURE_RX_SPI);
}
if (featureIsConfigured(FEATURE_RX_SERIAL)) {
featureDisable(FEATURE_RX_PARALLEL_PWM | FEATURE_RX_MSP | FEATURE_RX_PPM | FEATURE_RX_SPI);
featureDisableImmediate(FEATURE_RX_PARALLEL_PWM | FEATURE_RX_MSP | FEATURE_RX_PPM | FEATURE_RX_SPI);
}
#ifdef USE_RX_SPI
if (featureIsConfigured(FEATURE_RX_SPI)) {
featureDisable(FEATURE_RX_SERIAL | FEATURE_RX_PARALLEL_PWM | FEATURE_RX_PPM | FEATURE_RX_MSP);
featureDisableImmediate(FEATURE_RX_SERIAL | FEATURE_RX_PARALLEL_PWM | FEATURE_RX_PPM | FEATURE_RX_MSP);
}
#endif // USE_RX_SPI
if (featureIsConfigured(FEATURE_RX_PARALLEL_PWM)) {
featureDisable(FEATURE_RX_SERIAL | FEATURE_RX_MSP | FEATURE_RX_PPM | FEATURE_RX_SPI);
featureDisableImmediate(FEATURE_RX_SERIAL | FEATURE_RX_MSP | FEATURE_RX_PPM | FEATURE_RX_SPI);
}
#if defined(USE_ADC)
@ -375,7 +375,7 @@ static void validateAndFixConfig(void)
#if defined(USE_ESC_SENSOR)
if (!findSerialPortConfig(FUNCTION_ESC_SENSOR)) {
featureDisable(FEATURE_ESC_SENSOR);
featureDisableImmediate(FEATURE_ESC_SENSOR);
}
#endif
@ -412,67 +412,67 @@ static void validateAndFixConfig(void)
// I have kept them all here in one place, some could be moved to sections of code above.
#ifndef USE_PPM
featureDisable(FEATURE_RX_PPM);
featureDisableImmediate(FEATURE_RX_PPM);
#endif
#ifndef USE_SERIAL_RX
featureDisable(FEATURE_RX_SERIAL);
featureDisableImmediate(FEATURE_RX_SERIAL);
#endif
#if !defined(USE_SOFTSERIAL1) && !defined(USE_SOFTSERIAL2)
featureDisable(FEATURE_SOFTSERIAL);
featureDisableImmediate(FEATURE_SOFTSERIAL);
#endif
#ifndef USE_RANGEFINDER
featureDisable(FEATURE_RANGEFINDER);
featureDisableImmediate(FEATURE_RANGEFINDER);
#endif
#ifndef USE_TELEMETRY
featureDisable(FEATURE_TELEMETRY);
featureDisableImmediate(FEATURE_TELEMETRY);
#endif
#ifndef USE_PWM
featureDisable(FEATURE_RX_PARALLEL_PWM);
featureDisableImmediate(FEATURE_RX_PARALLEL_PWM);
#endif
#ifndef USE_RX_MSP
featureDisable(FEATURE_RX_MSP);
featureDisableImmediate(FEATURE_RX_MSP);
#endif
#ifndef USE_LED_STRIP
featureDisable(FEATURE_LED_STRIP);
featureDisableImmediate(FEATURE_LED_STRIP);
#endif
#ifndef USE_DASHBOARD
featureDisable(FEATURE_DASHBOARD);
featureDisableImmediate(FEATURE_DASHBOARD);
#endif
#ifndef USE_OSD
featureDisable(FEATURE_OSD);
featureDisableImmediate(FEATURE_OSD);
#endif
#ifndef USE_SERVOS
featureDisable(FEATURE_SERVO_TILT | FEATURE_CHANNEL_FORWARDING);
featureDisableImmediate(FEATURE_SERVO_TILT | FEATURE_CHANNEL_FORWARDING);
#endif
#ifndef USE_TRANSPONDER
featureDisable(FEATURE_TRANSPONDER);
featureDisableImmediate(FEATURE_TRANSPONDER);
#endif
#ifndef USE_RX_SPI
featureDisable(FEATURE_RX_SPI);
featureDisableImmediate(FEATURE_RX_SPI);
#endif
#ifndef USE_ESC_SENSOR
featureDisable(FEATURE_ESC_SENSOR);
featureDisableImmediate(FEATURE_ESC_SENSOR);
#endif
#ifndef USE_GYRO_DATA_ANALYSE
featureDisable(FEATURE_DYNAMIC_FILTER);
featureDisableImmediate(FEATURE_DYNAMIC_FILTER);
#endif
#if !defined(USE_ADC)
featureDisable(FEATURE_RSSI_ADC);
featureDisableImmediate(FEATURE_RSSI_ADC);
#endif
#if defined(USE_BEEPER)
@ -562,7 +562,7 @@ void validateAndFixGyroConfig(void)
#ifdef USE_GYRO_DATA_ANALYSE
// Disable dynamic filter if gyro loop is less than 2KHz
if (gyro.targetLooptime > DYNAMIC_FILTER_MAX_SUPPORTED_LOOP_TIME) {
featureDisable(FEATURE_DYNAMIC_FILTER);
featureDisableImmediate(FEATURE_DYNAMIC_FILTER);
}
#endif

4
src/main/config/feature.c
View File

@ -70,7 +70,7 @@ bool featureIsConfigured(const uint32_t mask)
// Updates the configuration *AND* runtime state of a feature.
// Used *ONLY* by the config check process that runs at startup and EEPROM save.
void featureEnable(const uint32_t mask)
void featureEnableImmediate(const uint32_t mask)
{
featureSet(mask, &featureConfigMutable()->enabledFeatures);
featureSet(mask, &runtimeFeatureMask);
@ -78,7 +78,7 @@ void featureEnable(const uint32_t mask)
// Updates the configuration *AND* runtime state of a feature.
// Used *ONLY* by the config check process that runs at startup and EEPROM save.
void featureDisable(const uint32_t mask)
void featureDisableImmediate(const uint32_t mask)
{
featureClear(mask, &featureConfigMutable()->enabledFeatures);
featureClear(mask, &runtimeFeatureMask);

4
src/main/config/feature.h
View File

@ -65,8 +65,8 @@ PG_DECLARE(featureConfig_t, featureConfig);
void featureInit(void);
bool featureIsEnabled(const uint32_t mask);
bool featureIsConfigured(const uint32_t mask);
void featureEnable(const uint32_t mask);
void featureDisable(const uint32_t mask);
void featureEnableImmediate(const uint32_t mask);
void featureDisableImmediate(const uint32_t mask);
void featureConfigSet(const uint32_t mask);
void featureConfigClear(const uint32_t mask);
void featureConfigReplace(const uint32_t mask);

2
src/main/target/ALIENFLIGHTF3/config.c
View File

@ -104,7 +104,7 @@ void targetConfiguration(void)
rxConfigMutable()->serialrx_inverted = true;
serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(SERIALRX_UART)].functionMask = FUNCTION_TELEMETRY_FRSKY_HUB | FUNCTION_RX_SERIAL;
telemetryConfigMutable()->telemetry_inverted = false;
featureEnable(FEATURE_TELEMETRY);
featureConfigSet(FEATURE_TELEMETRY);
beeperDevConfigMutable()->isOpenDrain = false;
beeperDevConfigMutable()->isInverted = true;
parseRcChannels("AETR1234", rxConfigMutable());

2
src/main/target/ALIENFLIGHTF4/config.c
View File

@ -74,7 +74,7 @@ void targetConfiguration(void)
telemetryConfigMutable()->telemetry_inverted = false;
batteryConfigMutable()->voltageMeterSource = VOLTAGE_METER_ADC;
batteryConfigMutable()->currentMeterSource = CURRENT_METER_ADC;
featureEnable(FEATURE_TELEMETRY);
featureConfigSet(FEATURE_TELEMETRY);
}
for (uint8_t pidProfileIndex = 0; pidProfileIndex < PID_PROFILE_COUNT; pidProfileIndex++) {

2
src/main/target/ALIENFLIGHTNGF7/config.c
View File

@ -73,7 +73,7 @@ void targetConfiguration(void)
telemetryConfigMutable()->telemetry_inverted = false;
batteryConfigMutable()->voltageMeterSource = VOLTAGE_METER_ADC;
batteryConfigMutable()->currentMeterSource = CURRENT_METER_ADC;
featureEnable(FEATURE_TELEMETRY);
featureConfigSet(FEATURE_TELEMETRY);
}
for (uint8_t pidProfileIndex = 0; pidProfileIndex < PID_PROFILE_COUNT; pidProfileIndex++) {

2
src/main/target/ALIENWHOOP/config.c
View File

@ -105,7 +105,7 @@ void targetConfiguration(void)
pidConfigMutable()->runaway_takeoff_prevention = false;
featureEnable((FEATURE_DYNAMIC_FILTER | FEATURE_AIRMODE | FEATURE_ANTI_GRAVITY) ^ FEATURE_RX_PARALLEL_PWM);
featureConfigSet((FEATURE_DYNAMIC_FILTER | FEATURE_AIRMODE | FEATURE_ANTI_GRAVITY) ^ FEATURE_RX_PARALLEL_PWM);
/* AlienWhoop PIDs tested with 6mm and 7mm motors on most frames */
for (uint8_t pidProfileIndex = 0; pidProfileIndex < PID_PROFILE_COUNT; pidProfileIndex++) {

2
src/main/target/FF_FORTINIF4/config.c
View File

@ -35,7 +35,7 @@
void targetConfiguration(void)
{
if (hardwareRevision >= FORTINIF4_REV_2) {
featureEnable(FEATURE_OSD);
featureConfigSet(FEATURE_OSD);
}
telemetryConfigMutable()->halfDuplex = false;

2
src/main/target/FF_PIKOBLX/config.c
View File

@ -65,7 +65,7 @@ void targetConfiguration(void)
#else
serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(SERIAL_PORT_USART2)].functionMask = FUNCTION_TELEMETRY_FRSKY_HUB;
rxConfigMutable()->serialrx_inverted = true;
featureEnable(FEATURE_TELEMETRY);
featureConfigSet(FEATURE_TELEMETRY);
#endif
parseRcChannels("TAER1234", rxConfigMutable());

4
src/main/target/XILOF4/config.c
View File

@ -54,8 +54,8 @@ void targetConfiguration(void)
motorConfigMutable()->dev.motorPwmProtocol = PWM_TYPE_DSHOT600;
pidConfigMutable()->pid_process_denom = 1;
currentSensorADCConfigMutable()->scale = CURRENT_SCALE;
featureDisable(FEATURE_SOFTSERIAL);
featureEnable(FEATURE_ESC_SENSOR);
featureConfigClear(FEATURE_SOFTSERIAL);
featureConfigSet(FEATURE_ESC_SENSOR);
targetSerialPortFunctionConfig(targetSerialPortFunction, ARRAYLEN(targetSerialPortFunction));
}

2
src/test/unit/link_quality_unittest.cc
View File

@ -447,7 +447,7 @@ extern "C" {
void persistentObjectWrite(persistentObjectId_e, uint32_t) {}
void failsafeOnRxSuspend(uint32_t ) {}
void failsafeOnRxResume(void) {}
void featureDisable(uint32_t) { }
void featureDisableImmediate(uint32_t) { }
bool rxMspFrameComplete(void) { return false; }
bool isPPMDataBeingReceived(void) { return false; }
bool isPWMDataBeingReceived(void) { return false; }

2
src/test/unit/rx_ranges_unittest.cc
View File

@ -193,7 +193,7 @@ bool featureIsEnabled(uint32_t) {
return false;
}
void featureDisable(uint32_t) {
void featureDisableImmediate(uint32_t) {
}
bool rxMspFrameComplete(void)