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

Substitute FEATURE_MSP_DISPLAYPORT with !defined(OSD)

Browse source 
Save feature bits.
This commit is contained in:
jflyper 2016-11-07 22:29:35 +09:00
parent 5a6828b87f
commit c12942ed41
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -55,7 +55,6 @@ typedef enum {
FEATURE_VTX = 1 << 24, FEATURE_VTX = 1 << 24,
FEATURE_RX_SPI = 1 << 25, FEATURE_RX_SPI = 1 << 25,
FEATURE_SOFTSPI = 1 << 26, FEATURE_SOFTSPI = 1 << 26,
FEATURE_MSP_DISPLAYPORT = 1 << 27,
} features_e; } features_e;
void beeperOffSet(uint32_t mask); void beeperOffSet(uint32_t mask);

2
src/main/io/serial_cli.c
View file

@ -229,7 +229,7 @@ static const char * const featureNames[] = {
"SONAR", "TELEMETRY", "CURRENT_METER", "3D", "RX_PARALLEL_PWM", "SONAR", "TELEMETRY", "CURRENT_METER", "3D", "RX_PARALLEL_PWM",
"RX_MSP", "RSSI_ADC", "LED_STRIP", "DISPLAY", "OSD", "RX_MSP", "RSSI_ADC", "LED_STRIP", "DISPLAY", "OSD",
"BLACKBOX", "CHANNEL_FORWARDING", "TRANSPONDER", "AIRMODE", "BLACKBOX", "CHANNEL_FORWARDING", "TRANSPONDER", "AIRMODE",
" ", "VTX", "RX_SPI", "SOFTSPI", "MSP_DISPLAYPORT", NULL " ", "VTX", "RX_SPI", "SOFTSPI", NULL
}; };
// sync this with rxFailsafeChannelMode_e // sync this with rxFailsafeChannelMode_e

4
src/main/main.c
View file

@ -460,10 +460,8 @@ void init(void)
mspFcInit(); mspFcInit();
mspSerialInit(); mspSerialInit();
#ifdef USE_MSP_DISPLAYPORT #if defined(USE_MSP_DISPLAYPORT) && defined(CMS)
if (feature(FEATURE_MSP_DISPLAYPORT)) {
cmsDisplayPortRegister(displayPortMspInit()); cmsDisplayPortRegister(displayPortMspInit());
}
#endif #endif
#ifdef USE_CLI #ifdef USE_CLI