Merge branch '2.3' into 2.4
This commit is contained in:
@@ -362,6 +362,10 @@ if(JUMPER_RELEASE)
|
||||
add_definitions(-DJUMPER_RELEASE)
|
||||
endif()
|
||||
|
||||
if(RADIOMASTER_RELEASE)
|
||||
add_definitions(-DRADIOMASTER_RELEASE)
|
||||
endif()
|
||||
|
||||
if(TBS_RELEASE)
|
||||
add_definitions(-DTBS_RELEASE)
|
||||
endif()
|
||||
|
||||
@@ -186,7 +186,7 @@ static const char * const PXX2ReceiversNames[] = {
|
||||
"R9-SLIM+",
|
||||
"R9-MINI",
|
||||
"R9-MM",
|
||||
"R9-STAB",
|
||||
"R9-STAB", // R9-STAB has OTA
|
||||
"R9-MINI-OTA", // this one has OTA (different bootloader)
|
||||
"R9-MM-OTA", // this one has OTA (different bootloader)
|
||||
"R9-SLIM+-OTA", // this one has OTA (different bootloader)
|
||||
@@ -236,7 +236,7 @@ static const uint8_t PXX2ReceiverOptions[] = {
|
||||
0b11111110, // R9-SLIM+
|
||||
0b11111110, // R9-MINI
|
||||
0b11111110, // R9-MM
|
||||
0b11111110, // R9-STAB
|
||||
0b11111111, // R9-STAB+OTA
|
||||
0b11111111, // R9-MINI+OTA
|
||||
0b11111111, // R9-MM+OTA
|
||||
0b11111111, // R9-SLIM+OTA
|
||||
|
||||
@@ -32,6 +32,8 @@
|
||||
#define DISPLAY_VERSION "FrSky"
|
||||
#elif defined(JUMPER_RELEASE)
|
||||
#define DISPLAY_VERSION "JumperRC"
|
||||
#elif defined(RADIOMASTER_RELEASE)
|
||||
#define DISPLAY_VERSION "Radiomaster"
|
||||
#elif defined(TBS_RELEASE)
|
||||
#define DISPLAY_VERSION "TBS"
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user