Change feature name to MSP_DISPLAYPORT
And some build option fix.
This commit is contained in:
parent
3c2849ffdc
commit
1da1837288
|
@ -31,7 +31,7 @@
|
|||
#include "config/config_master.h"
|
||||
#include "config/feature.h"
|
||||
|
||||
#ifdef CMS
|
||||
#if defined(OSD) && defined(CMS)
|
||||
|
||||
OSD_UINT8_t entryAlarmRssi = {&masterConfig.osdProfile.rssi_alarm, 5, 90, 5};
|
||||
OSD_UINT16_t entryAlarmCapacity = {&masterConfig.osdProfile.cap_alarm, 50, 30000, 50};
|
||||
|
|
|
@ -55,7 +55,7 @@ typedef enum {
|
|||
FEATURE_VTX = 1 << 24,
|
||||
FEATURE_RX_SPI = 1 << 25,
|
||||
FEATURE_SOFTSPI = 1 << 26,
|
||||
FEATURE_MSP_OSD = 1 << 27,
|
||||
FEATURE_MSP_DISPLAYPORT = 1 << 27,
|
||||
} features_e;
|
||||
|
||||
void beeperOffSet(uint32_t mask);
|
||||
|
|
|
@ -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_OSD", NULL
|
||||
" ", "VTX", "RX_SPI", "SOFTSPI", "MSP_DISPLAYPORT", NULL
|
||||
};
|
||||
|
||||
// sync this with rxFailsafeChannelMode_e
|
||||
|
|
|
@ -461,7 +461,7 @@ void init(void)
|
|||
mspSerialInit();
|
||||
|
||||
#ifdef USE_MSP_DISPLAYPORT
|
||||
if (feature(FEATURE_MSP_OSD)) {
|
||||
if (feature(FEATURE_MSP_DISPLAYPORT)) {
|
||||
cmsDisplayPortRegister(displayPortMspInit());
|
||||
}
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue