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

Merge with latest 2.3

Browse source
This commit is contained in:
Bertrand Songis 2020-03-18 17:09:38 +01:00
commit 1d96af49c4
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
52 changed files with 520 additions and 301 deletions
Download patch file Download diff file Expand all files Collapse all files

19
radio/src/gui/common/stdlcd/radio_hardware.cpp
View file

@ -184,6 +184,9 @@ enum {
ITEM_RADIO_HARDWARE_JITTER_FILTER,
ITEM_RADIO_HARDWARE_RAS,
#if defined(SPORT_UPDATE_PWR_GPIO)
ITEM_RADIO_HARDWARE_SPORT_UPDATE_POWER,
#endif
ITEM_RADIO_HARDWARE_DEBUG,
#if defined(EEPROM_RLC)
ITEM_RADIO_BACKUP_EEPROM,
@ -295,6 +298,12 @@ void onHardwareAntennaSwitchConfirm(const char * result)
#define HW_SETTINGS_COLUMN2 (HW_SETTINGS_COLUMN1 + 5*FW)
#endif
#if defined(SPORT_UPDATE_PWR_GPIO)
#define SPORT_POWER_ROWS 0,
#else
#define SPORT_POWER_ROWS
#endif
#if defined(EEPROM_RLC)
void onFactoryResetConfirm(const char * result)
{
@ -334,7 +343,7 @@ void menuRadioHardware(event_t event)
0 /* ADC filter */,
READONLY_ROW /* RAS */,
SPORT_POWER_ROWS
1 /* debugs */,
0,
@ -631,6 +640,14 @@ void menuRadioHardware(event_t event)
else
lcdDrawText(lcdNextPos, y, "---");
break;
#if defined(SPORT_UPDATE_PWR_GPIO)
case ITEM_RADIO_HARDWARE_SPORT_UPDATE_POWER:
g_eeGeneral.sportUpdatePower = editChoice(HW_SETTINGS_COLUMN2, y, STR_SPORT_UPDATE_POWER_MODE, STR_SPORT_UPDATE_POWER_MODES, g_eeGeneral.sportUpdatePower, 0, 1, attr, event);
if (attr && checkIncDec_Ret) {
SPORT_UPDATE_POWER_INIT();
}
break;
#endif
case ITEM_RADIO_HARDWARE_DEBUG:
lcdDrawTextAlignedLeft(y, STR_DEBUG);