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

Change feature name to MSP_DISPLAYPORT

Browse source 
And some build option fix.
This commit is contained in:
jflyper 2016-11-07 18:53:23 +09:00
parent 3c2849ffdc
commit 1da1837288
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/cms/cms_menu_osd.c
View file

@ -31,7 +31,7 @@
#include "config/config_master.h" #include "config/config_master.h"
#include "config/feature.h" #include "config/feature.h"
#ifdef CMS #if defined(OSD) && defined(CMS)
OSD_UINT8_t entryAlarmRssi = {&masterConfig.osdProfile.rssi_alarm, 5, 90, 5}; OSD_UINT8_t entryAlarmRssi = {&masterConfig.osdProfile.rssi_alarm, 5, 90, 5};
OSD_UINT16_t entryAlarmCapacity = {&masterConfig.osdProfile.cap_alarm, 50, 30000, 50}; OSD_UINT16_t entryAlarmCapacity = {&masterConfig.osdProfile.cap_alarm, 50, 30000, 50};

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

@ -55,7 +55,7 @@ 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_OSD = 1 << 27, 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_OSD", NULL " ", "VTX", "RX_SPI", "SOFTSPI", "MSP_DISPLAYPORT", NULL
}; };
// sync this with rxFailsafeChannelMode_e // sync this with rxFailsafeChannelMode_e

2
src/main/main.c
View file

@ -461,7 +461,7 @@ void init(void)
mspSerialInit(); mspSerialInit();
#ifdef USE_MSP_DISPLAYPORT #ifdef USE_MSP_DISPLAYPORT
if (feature(FEATURE_MSP_OSD)) { if (feature(FEATURE_MSP_DISPLAYPORT)) {
cmsDisplayPortRegister(displayPortMspInit()); cmsDisplayPortRegister(displayPortMspInit());
} }
#endif #endif