Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-20 23:05:19 +03:00
Code Issues Wiki Activity

Merge pull request #3466 from basdelfos/feature_cleanup

Browse source 
Cleanup unused features
This commit is contained in:
Michael Keller 2017-07-12 11:36:33 +12:00 • committed by GitHub
commit 1a472b199c
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -162,12 +162,12 @@ static const char * const mixerNames[] = {
// sync this with features_e // sync this with features_e
static const char * const featureNames[] = { static const char * const featureNames[] = {
"RX_PPM", "VBAT", "INFLIGHT_ACC_CAL", "RX_SERIAL", "MOTOR_STOP", "RX_PPM", "", "INFLIGHT_ACC_CAL", "RX_SERIAL", "MOTOR_STOP",
"SERVO_TILT", "SOFTSERIAL", "GPS", "FAILSAFE", "SERVO_TILT", "SOFTSERIAL", "GPS", "FAILSAFE",
"SONAR", "TELEMETRY", "CURRENT_METER", "3D", "RX_PARALLEL_PWM", "SONAR", "TELEMETRY", "", "3D", "RX_PARALLEL_PWM",
"RX_MSP", "RSSI_ADC", "LED_STRIP", "DISPLAY", "OSD", "RX_MSP", "RSSI_ADC", "LED_STRIP", "DISPLAY", "OSD",
"UNUSED", "CHANNEL_FORWARDING", "TRANSPONDER", "AIRMODE", "", "CHANNEL_FORWARDING", "TRANSPONDER", "AIRMODE",
"SDCARD", "VTX", "RX_SPI", "SOFTSPI", "ESC_SENSOR", "ANTI_GRAVITY", "DYNAMIC_FILTER", NULL "", "", "RX_SPI", "SOFTSPI", "ESC_SENSOR", "ANTI_GRAVITY", "DYNAMIC_FILTER", NULL
}; };
// sync this with rxFailsafeChannelMode_e // sync this with rxFailsafeChannelMode_e
@ -1946,7 +1946,8 @@ static void cliFeature(char *cmdline)
for (uint32_t i = 0; ; i++) { for (uint32_t i = 0; ; i++) {
if (featureNames[i] == NULL) if (featureNames[i] == NULL)
break; break;
cliPrintf(" %s", featureNames[i]); if (strcmp(featureNames[i], "") != 0) //Skip unused
cliPrintf(" %s", featureNames[i]);
} }
cliPrintLinefeed(); cliPrintLinefeed();
return; return;
@ -2746,7 +2747,7 @@ static void cliSet(char *cmdline)
break; break;
} }
} else if ((valEnd == NULL) && (i == arrayLength - 1)) { } else if ((valEnd == NULL) && (i == arrayLength - 1)) {
array[i] = atoi(valPtr); array[i] = atoi(valPtr);
uint8_t *ptr = getValuePointer(val); uint8_t *ptr = getValuePointer(val);
memcpy(ptr, array, arrayLength); memcpy(ptr, array, arrayLength);

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

@ -33,7 +33,6 @@
typedef enum { typedef enum {
FEATURE_RX_PPM = 1 << 0, FEATURE_RX_PPM = 1 << 0,
//FEATURE_VBAT = 1 << 1,
FEATURE_INFLIGHT_ACC_CAL = 1 << 2, FEATURE_INFLIGHT_ACC_CAL = 1 << 2,
FEATURE_RX_SERIAL = 1 << 3, FEATURE_RX_SERIAL = 1 << 3,
FEATURE_MOTOR_STOP = 1 << 4, FEATURE_MOTOR_STOP = 1 << 4,
@ -43,7 +42,6 @@ typedef enum {
FEATURE_FAILSAFE = 1 << 8, FEATURE_FAILSAFE = 1 << 8,
FEATURE_SONAR = 1 << 9, FEATURE_SONAR = 1 << 9,
FEATURE_TELEMETRY = 1 << 10, FEATURE_TELEMETRY = 1 << 10,
//FEATURE_CURRENT_METER = 1 << 11,
FEATURE_3D = 1 << 12, FEATURE_3D = 1 << 12,
FEATURE_RX_PARALLEL_PWM = 1 << 13, FEATURE_RX_PARALLEL_PWM = 1 << 13,
FEATURE_RX_MSP = 1 << 14, FEATURE_RX_MSP = 1 << 14,
@ -51,12 +49,9 @@ typedef enum {
FEATURE_LED_STRIP = 1 << 16, FEATURE_LED_STRIP = 1 << 16,
FEATURE_DASHBOARD = 1 << 17, FEATURE_DASHBOARD = 1 << 17,
FEATURE_OSD = 1 << 18, FEATURE_OSD = 1 << 18,
FEATURE_BLACKBOX_UNUSED = 1 << 19,
FEATURE_CHANNEL_FORWARDING = 1 << 20, FEATURE_CHANNEL_FORWARDING = 1 << 20,
FEATURE_TRANSPONDER = 1 << 21, FEATURE_TRANSPONDER = 1 << 21,
FEATURE_AIRMODE = 1 << 22, FEATURE_AIRMODE = 1 << 22,
FEATURE_SDCARD_UNUSED = 1 << 23,
//FEATURE_VTX = 1 << 24,
FEATURE_RX_SPI = 1 << 25, FEATURE_RX_SPI = 1 << 25,
FEATURE_SOFTSPI = 1 << 26, FEATURE_SOFTSPI = 1 << 26,
FEATURE_ESC_SENSOR = 1 << 27, FEATURE_ESC_SENSOR = 1 << 27,