Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-20 23:05:09 +03:00
Code Activity

Bsongis/r9m access (#6617)

Browse source 
R9M Access support on X9D+ 2019
This commit is contained in:
Bertrand Songis 2019-08-12 11:41:36 +02:00 • committed by GitHub
parent e2a7813afa
commit 7edaebffde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
radio/src/gui/128x64/radio_setup.cpp
View file

@ -87,9 +87,7 @@ enum {
CASE_PWM_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_BRIGHTNESS_ON) CASE_PWM_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_BRIGHTNESS_ON)
ITEM_RADIO_SETUP_FLASH_BEEP, ITEM_RADIO_SETUP_FLASH_BEEP,
CASE_SPLASH_PARAM(ITEM_RADIO_SETUP_DISABLE_SPLASH) CASE_SPLASH_PARAM(ITEM_RADIO_SETUP_DISABLE_SPLASH)
#if defined(PXX2) CASE_PXX2(ITEM_RADIO_SETUP_OWNER_ID)
ITEM_RADIO_SETUP_OWNER_ID,
#endif
CASE_GPS(ITEM_RADIO_SETUP_TIMEZONE) CASE_GPS(ITEM_RADIO_SETUP_TIMEZONE)
ITEM_RADIO_SETUP_ADJUST_RTC, ITEM_RADIO_SETUP_ADJUST_RTC,
CASE_GPS(ITEM_RADIO_SETUP_GPSFORMAT) CASE_GPS(ITEM_RADIO_SETUP_GPSFORMAT)
@ -530,7 +528,7 @@ void menuRadioSetup(event_t event)
break; break;
#endif #endif
#if defined(PXX) #if defined(PXX1)
case ITEM_RADIO_SETUP_COUNTRYCODE: case ITEM_RADIO_SETUP_COUNTRYCODE:
g_eeGeneral.countryCode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_COUNTRYCODE, STR_COUNTRYCODES, g_eeGeneral.countryCode, 0, 2, attr, event); g_eeGeneral.countryCode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_COUNTRYCODE, STR_COUNTRYCODES, g_eeGeneral.countryCode, 0, 2, attr, event);
break; break;

2
radio/src/gui/212x64/radio_setup.cpp
View file

@ -486,7 +486,7 @@ void menuRadioSetup(event_t event)
break; break;
#endif #endif
#if defined(PXX) #if defined(PXX1)
case ITEM_RADIO_SETUP_COUNTRYCODE: case ITEM_RADIO_SETUP_COUNTRYCODE:
g_eeGeneral.countryCode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_COUNTRYCODE, STR_COUNTRYCODES, g_eeGeneral.countryCode, 0, 2, attr, event); g_eeGeneral.countryCode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_COUNTRYCODE, STR_COUNTRYCODES, g_eeGeneral.countryCode, 0, 2, attr, event);
break; break;

6
radio/src/gui/gui_common.cpp
View file

@ -607,15 +607,15 @@ bool isExternalModuleAvailable(int moduleType)
#endif #endif
#if !defined(HARDWARE_EXTERNAL_MODULE_SIZE_STD) #if !defined(HARDWARE_EXTERNAL_MODULE_SIZE_STD)
if (moduleType == MODULE_TYPE_R9M_PXX1) if (moduleType == MODULE_TYPE_R9M_PXX1 || moduleType == MODULE_TYPE_R9M_PXX2)
return false; return false;
#endif #endif
if (moduleType == MODULE_TYPE_R9M_PXX2 || moduleType == MODULE_TYPE_ISRM_PXX2) if (moduleType == MODULE_TYPE_ISRM_PXX2)
return false; // doesn't exist for now return false; // doesn't exist for now
#if !defined(PXX2) #if !defined(PXX2)
if (moduleType == MODULE_TYPE_XJT_LITE_PXX2 || moduleType == MODULE_TYPE_R9M_LITE_PXX2 || moduleType == MODULE_TYPE_R9M_LITE_PRO_PXX2) { if (moduleType == MODULE_TYPE_XJT_LITE_PXX2 || moduleType == MODULE_TYPE_R9M_PXX2 || moduleType == MODULE_TYPE_R9M_LITE_PXX2 || moduleType == MODULE_TYPE_R9M_LITE_PRO_PXX2) {
return false; return false;
} }
#endif #endif

6
radio/src/pulses/pulses.cpp
View file

@ -73,12 +73,12 @@ uint8_t getRequiredProtocol(uint8_t module)
break; break;
case MODULE_TYPE_ISRM_PXX2: case MODULE_TYPE_ISRM_PXX2:
case MODULE_TYPE_R9M_LITE_PRO_PXX2:
case MODULE_TYPE_XJT_LITE_PXX2: case MODULE_TYPE_XJT_LITE_PXX2:
case MODULE_TYPE_R9M_PXX2:
case MODULE_TYPE_R9M_LITE_PRO_PXX2:
protocol = PROTOCOL_CHANNELS_PXX2_HIGHSPEED; protocol = PROTOCOL_CHANNELS_PXX2_HIGHSPEED;
break; break;
case MODULE_TYPE_R9M_PXX2:
case MODULE_TYPE_R9M_LITE_PXX2: case MODULE_TYPE_R9M_LITE_PXX2:
protocol = PROTOCOL_CHANNELS_PXX2_LOWSPEED; protocol = PROTOCOL_CHANNELS_PXX2_LOWSPEED;
break; break;
@ -169,7 +169,7 @@ void enablePulsesExternalModule(uint8_t protocol)
break; break;
#endif #endif
#if defined(PXX2) && defined(HARDWARE_EXTERNAL_MODULE_SIZE_SML) #if defined(PXX2)
case PROTOCOL_CHANNELS_PXX2_HIGHSPEED: case PROTOCOL_CHANNELS_PXX2_HIGHSPEED:
extmoduleInvertedSerialStart(PXX2_HIGHSPEED_BAUDRATE); extmoduleInvertedSerialStart(PXX2_HIGHSPEED_BAUDRATE);
break; break;