From f03f8a288d75f68b14914ddf04bbc1138950745e Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sat, 17 Aug 2019 16:06:27 +0200 Subject: [PATCH 1/3] fix pwr-on/off settings --- companion/src/firmwares/opentx/opentxeeprom.cpp | 5 ++--- radio/src/datastructs.h | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp index b4ec24d5b..718c9e2b1 100644 --- a/companion/src/firmwares/opentx/opentxeeprom.cpp +++ b/companion/src/firmwares/opentx/opentxeeprom.cpp @@ -2407,9 +2407,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)); diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h index 8e58f928d..88ce4159c 100644 --- a/radio/src/datastructs.h +++ b/radio/src/datastructs.h @@ -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); From 1bbf398237c29629eed969ca6a5f2d05f919d327 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sat, 17 Aug 2019 18:14:49 +0200 Subject: [PATCH 2/3] use sliders on stdlcd --- radio/src/gui/128x64/radio_setup.cpp | 4 ++-- radio/src/gui/212x64/radio_setup.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp index 30b37b156..b273bb736 100644 --- a/radio/src/gui/128x64/radio_setup.cpp +++ b/radio/src/gui/128x64/radio_setup.cpp @@ -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 diff --git a/radio/src/gui/212x64/radio_setup.cpp b/radio/src/gui/212x64/radio_setup.cpp index c4848fe9f..fe3184d7f 100644 --- a/radio/src/gui/212x64/radio_setup.cpp +++ b/radio/src/gui/212x64/radio_setup.cpp @@ -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, 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 From 9de6b47ddad44f6a6b8620fcb7bcbe3bf614856c Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sat, 17 Aug 2019 18:40:14 +0200 Subject: [PATCH 3/3] wide lcd has 1 arg less in drawSlider --- radio/src/gui/212x64/radio_setup.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/212x64/radio_setup.cpp b/radio/src/gui/212x64/radio_setup.cpp index fe3184d7f..27fe53f2b 100644 --- a/radio/src/gui/212x64/radio_setup.cpp +++ b/radio/src/gui/212x64/radio_setup.cpp @@ -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); - drawSlider(RADIO_SETUP_2ND_COLUMN, y, LCD_W - 2 - RADIO_SETUP_2ND_COLUMN, g_eeGeneral.pwrOnSpeed +1, 3, attr); + 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); - drawSlider(RADIO_SETUP_2ND_COLUMN, y, LCD_W - 2 - RADIO_SETUP_2ND_COLUMN, g_eeGeneral.pwrOffSpeed +1, 3, attr); + 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