piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6634 from opentx/raphaelcoeffic/fast-poweroff-fixes

Browse Source 
fast poweroff fixes
This commit is contained in:
Bertrand Songis
2019-08-17 20:07:59 +02:00
committed by GitHub
parent f33980eda2 9de6b47dda
commit 57245c0eda
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/opentx/opentxeeprom.cpp
+2 -3
View File
@@ -2431,9 +2431,8 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
internalField.Append(new UnsignedField<2>(this, generalData.countryCode));
if (version >= 219 && IS_HORUS_OR_TARANIS(board)) {
internalField.Append(new SignedField<2>(this, generalData.pwrOnSpeed, "Power On Speed"));
internalField.Append(new SignedField<2>(this, generalData.pwrOffSpeed, "Power Off Speed"));
internalField.Append(new SpareBitsField<2>(this));
internalField.Append(new SignedField<3>(this, generalData.pwrOnSpeed, "Power On Speed"));
internalField.Append(new SignedField<3>(this, generalData.pwrOffSpeed, "Power Off Speed"));
}
else {
internalField.Append(new SpareBitsField<6>(this));
radio/src/datastructs.h
+2 -3
View File
@@ -772,9 +772,8 @@ PACK(struct RadioData {
NOBACKUP(uint8_t bluetoothBaudrate:4);
NOBACKUP(uint8_t bluetoothMode:4);
NOBACKUP(uint8_t countryCode:2);
NOBACKUP(int8_t pwrOnSpeed:2);
NOBACKUP(int8_t pwrOffSpeed:2);
NOBACKUP(uint8_t spare5:2);
NOBACKUP(int8_t pwrOnSpeed:3);
NOBACKUP(int8_t pwrOffSpeed:3);
NOBACKUP(uint8_t imperial:1);
NOBACKUP(uint8_t jitterFilter:1); /* 0 - active */
NOBACKUP(uint8_t disableRssiPoweroffAlarm:1);
radio/src/gui/128x64/radio_setup.cpp
+2 -2
View File
@@ -512,13 +512,13 @@ void menuRadioSetup(event_t event)
#if defined(PWR_BUTTON_PRESS)
case ITEM_RADIO_SETUP_PWR_ON_SPEED:
lcdDrawTextAlignedLeft(y, STR_PWR_ON_SPEED);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.pwrOnSpeed + 1, attr|LEFT);
drawSlider(RADIO_SETUP_2ND_COLUMN, y, LCD_W - 2 - RADIO_SETUP_2ND_COLUMN, g_eeGeneral.pwrOnSpeed +1, 3, attr);
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.pwrOnSpeed, -1, 2);
break;
case ITEM_RADIO_SETUP_PWR_OFF_SPEED:
lcdDrawTextAlignedLeft(y, STR_PWR_OFF_SPEED);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.pwrOffSpeed + 1, attr|LEFT);
drawSlider(RADIO_SETUP_2ND_COLUMN, y, LCD_W - 2 - RADIO_SETUP_2ND_COLUMN, g_eeGeneral.pwrOffSpeed +1, 3, attr);
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.pwrOffSpeed, -1, 2);
break;
#endif
radio/src/gui/212x64/radio_setup.cpp
+2 -2
View File
@@ -473,13 +473,13 @@ void menuRadioSetup(event_t event)
#if defined(PWR_BUTTON_PRESS)
case ITEM_RADIO_SETUP_PWR_ON_SPEED:
lcdDrawTextAlignedLeft(y, STR_PWR_ON_SPEED);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.pwrOnSpeed + 1, attr|LEFT);
drawSlider(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.pwrOnSpeed +1, 3, attr);
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.pwrOnSpeed, -1, 2);
break;
case ITEM_RADIO_SETUP_PWR_OFF_SPEED:
lcdDrawTextAlignedLeft(y, STR_PWR_OFF_SPEED);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.pwrOffSpeed + 1, attr|LEFT);
drawSlider(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.pwrOffSpeed +1, 3, attr);
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.pwrOffSpeed, -1, 2);
break;
#endif