1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 13:25:30 +03:00

Substitute FEATURE_MSP_DISPLAYPORT with !defined(OSD)

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

View file

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

View file

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

View file

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