From d086cfb9eb9412433ff801c82e325554de326adf Mon Sep 17 00:00:00 2001 From: 3djc Date: Fri, 31 Jul 2020 15:57:54 +0200 Subject: [PATCH] Radio hardware screen improvements (#7843) Move some items in 212 radio right Fix X9E BT mode issue --- radio/src/dataconstants.h | 5 +++++ radio/src/gui/480x272/radio_hardware.cpp | 2 +- radio/src/gui/common/stdlcd/radio_hardware.cpp | 4 ++-- radio/src/translations/en.h.txt | 2 +- radio/src/translations/it.h.txt | 16 ++++++++-------- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index d47b0eeae..512ac301f 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -893,6 +893,11 @@ enum BluetoothModes { BLUETOOTH_OFF, BLUETOOTH_TELEMETRY, BLUETOOTH_TRAINER, +#if defined(PCBX9E) + BLUETOOTH_MAX=BLUETOOTH_TELEMETRY +#else + BLUETOOTH_MAX=BLUETOOTH_TRAINER +#endif }; // PXX2 constants diff --git a/radio/src/gui/480x272/radio_hardware.cpp b/radio/src/gui/480x272/radio_hardware.cpp index 8020bf983..ff6d36ade 100644 --- a/radio/src/gui/480x272/radio_hardware.cpp +++ b/radio/src/gui/480x272/radio_hardware.cpp @@ -325,7 +325,7 @@ bool menuRadioHardware(event_t event) #if defined(BLUETOOTH) case ITEM_RADIO_HARDWARE_BLUETOOTH_MODE: lcdDrawText(MENUS_MARGIN_LEFT, y, STR_BLUETOOTH); - g_eeGeneral.bluetoothMode = editChoice(HW_SETTINGS_COLUMN2, y, STR_BLUETOOTH_MODES, g_eeGeneral.bluetoothMode, BLUETOOTH_OFF, BLUETOOTH_TRAINER, attr, event); + g_eeGeneral.bluetoothMode = editChoice(HW_SETTINGS_COLUMN2, y, STR_BLUETOOTH_MODES, g_eeGeneral.bluetoothMode, BLUETOOTH_OFF, BLUETOOTH_MAX, attr, event); break; case ITEM_RADIO_HARDWARE_BLUETOOTH_PAIRING_CODE: diff --git a/radio/src/gui/common/stdlcd/radio_hardware.cpp b/radio/src/gui/common/stdlcd/radio_hardware.cpp index dde563d6a..a2d486193 100644 --- a/radio/src/gui/common/stdlcd/radio_hardware.cpp +++ b/radio/src/gui/common/stdlcd/radio_hardware.cpp @@ -292,7 +292,7 @@ void onHardwareAntennaSwitchConfirm(const char * result) #if LCD_W >= 212 #define HW_SETTINGS_COLUMN1 12*FW - #define HW_SETTINGS_COLUMN2 (HW_SETTINGS_COLUMN1 + 6*FW) + #define HW_SETTINGS_COLUMN2 (20*FW - 3) #else #define HW_SETTINGS_COLUMN1 30 #define HW_SETTINGS_COLUMN2 (HW_SETTINGS_COLUMN1 + 5*FW) @@ -569,7 +569,7 @@ void menuRadioHardware(event_t event) lcdDrawTextAlignedLeft(y, STR_BLUETOOTH); lcdDrawTextAtIndex(HW_SETTINGS_COLUMN2, y, STR_BLUETOOTH_MODES, g_eeGeneral.bluetoothMode, attr); if (attr) { - g_eeGeneral.bluetoothMode = checkIncDecGen(event, g_eeGeneral.bluetoothMode, BLUETOOTH_OFF, BLUETOOTH_TRAINER); + g_eeGeneral.bluetoothMode = checkIncDecGen(event, g_eeGeneral.bluetoothMode, BLUETOOTH_OFF, BLUETOOTH_MAX); } break; diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 706197f33..a5a809ec5 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -925,7 +925,7 @@ #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_RESET_BTN BUTTON("Reset") #define TR_DEBUG "Debug" -#define TR_KEYS_BTN BUTTON(TR("Keys", "Switches")) +#define TR_KEYS_BTN BUTTON("Keys") #define TR_ANALOGS_BTN BUTTON(TR("Anas", "Analogs")) #define TR_TOUCH_NOTFOUND "Touch hardware not found" #define TR_TOUCH_EXIT "Touch screen to exit" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 034bcd7db..5ee5463c1 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -940,11 +940,11 @@ #define TR_DEL_BUTTON BUTTON(TR("Canc.", "Cancella")) #define TR_RESET_BTN "[Reset]" #define TR_DEBUG "Debug" -#define TR_KEYS_BTN BUTTON(TR("SW","Interruttori")) -#define TR_ANALOGS_BTN BUTTON(TR("Analogico","Analogici")) -#define TR_TOUCH_NOTFOUND "Schermo touch non trovato" -#define TR_TOUCH_EXIT "Tocca lo schermo per uscire" -#define TR_CALIBRATION TR("Calibraz.", "Calibrazione") +#define TR_KEYS_BTN BUTTON(TR("SW", "Tasti")) +#define TR_ANALOGS_BTN BUTTON("Analogici") +#define TR_TOUCH_NOTFOUND "Schermo touch non trovato" +#define TR_TOUCH_EXIT "Tocca lo schermo per uscire" +#define TR_CALIBRATION TR("Calibraz.", "Calibrazione") #define TR_SET "[Set]" #define TR_TRAINER TR("Trainer", "Maestro/Allievo") #define TR_CHANS "Canali" @@ -1220,12 +1220,12 @@ #define TR_MENU_OTHER "Altro" #define TR_MENU_INVERT "Inverti" #define TR_JITTER_FILTER "Filtro ADC" -#define TR_RTC_CHECK TR("Controllo RTC", "Controllo voltaggio RTC") -#define TR_AUTH_FAILURE "Auth-failure" +#define TR_RTC_CHECK TR("Controllo RTC", "Controllo volt. RTC") +#define TR_AUTH_FAILURE "Auth-failure" #define ZSTR_VFR "VFR" #define ZSTR_RSSI "RSSI" -#define ZSTR_R9PW "R9PW" +#define ZSTR_R9PW "R9PW" #define ZSTR_RAS "SWR" #define ZSTR_A1 "A1" #define ZSTR_A2 "A2"