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

Removed unused feature 'SOFTSPI'. (#8931)

Browse source 
Removed unused feature 'SOFTSPI'.
This commit is contained in:
Michael Keller 2019-10-18 03:32:07 +13:00 • committed by GitHub
commit 5824bd4d93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/cli/cli.c
View file

@ -251,7 +251,7 @@ static const char * const featureNames[] = {
"RANGEFINDER", "TELEMETRY", "", "3D", "RX_PARALLEL_PWM", "RANGEFINDER", "TELEMETRY", "", "3D", "RX_PARALLEL_PWM",
"RX_MSP", "RSSI_ADC", "LED_STRIP", "DISPLAY", "OSD", "RX_MSP", "RSSI_ADC", "LED_STRIP", "DISPLAY", "OSD",
"", "CHANNEL_FORWARDING", "TRANSPONDER", "AIRMODE", "", "CHANNEL_FORWARDING", "TRANSPONDER", "AIRMODE",
"", "", "RX_SPI", "SOFTSPI", "ESC_SENSOR", "ANTI_GRAVITY", "DYNAMIC_FILTER", NULL "", "", "RX_SPI", "", "ESC_SENSOR", "ANTI_GRAVITY", "DYNAMIC_FILTER", NULL
}; };
// sync this with rxFailsafeChannelMode_e // sync this with rxFailsafeChannelMode_e

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

@ -50,7 +50,7 @@ typedef enum {
FEATURE_TRANSPONDER = 1 << 21, FEATURE_TRANSPONDER = 1 << 21,
FEATURE_AIRMODE = 1 << 22, FEATURE_AIRMODE = 1 << 22,
FEATURE_RX_SPI = 1 << 25, FEATURE_RX_SPI = 1 << 25,
FEATURE_SOFTSPI = 1 << 26, //FEATURE_SOFTSPI = 1 << 26, (removed)
FEATURE_ESC_SENSOR = 1 << 27, FEATURE_ESC_SENSOR = 1 << 27,
FEATURE_ANTI_GRAVITY = 1 << 28, FEATURE_ANTI_GRAVITY = 1 << 28,
FEATURE_DYNAMIC_FILTER = 1 << 29, FEATURE_DYNAMIC_FILTER = 1 << 29,

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

@ -298,22 +298,6 @@ static void validateAndFixConfig(void)
featureDisable(FEATURE_RX_SERIAL | FEATURE_RX_MSP | FEATURE_RX_PPM | FEATURE_RX_SPI); featureDisable(FEATURE_RX_SERIAL | FEATURE_RX_MSP | FEATURE_RX_PPM | FEATURE_RX_SPI);
} }
#ifdef USE_SOFTSPI
if (featureIsEnabled(FEATURE_SOFTSPI)) {
featureDisable(FEATURE_RX_PPM | FEATURE_RX_PARALLEL_PWM | FEATURE_SOFTSERIAL);
batteryConfigMutable()->voltageMeterSource = VOLTAGE_METER_NONE;
#if defined(STM32F10X)
featureDisable(FEATURE_LED_STRIP);
// rssi adc needs the same ports
featureDisable(FEATURE_RSSI_ADC);
// current meter needs the same ports
if (batteryConfig()->currentMeterSource == CURRENT_METER_ADC) {
batteryConfigMutable()->currentMeterSource = CURRENT_METER_NONE;
}
#endif // STM32F10X
}
#endif // USE_SOFTSPI
#if defined(USE_ADC) #if defined(USE_ADC)
if (featureIsEnabled(FEATURE_RSSI_ADC)) { if (featureIsEnabled(FEATURE_RSSI_ADC)) {
rxConfigMutable()->rssi_channel = 0; rxConfigMutable()->rssi_channel = 0;
@ -451,10 +435,6 @@ static void validateAndFixConfig(void)
featureDisable(FEATURE_RX_SPI); featureDisable(FEATURE_RX_SPI);
#endif #endif
#ifndef USE_SOFTSPI
featureDisable(FEATURE_SOFTSPI);
#endif
#ifndef USE_ESC_SENSOR #ifndef USE_ESC_SENSOR
featureDisable(FEATURE_ESC_SENSOR); featureDisable(FEATURE_ESC_SENSOR);
#endif #endif