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

Radio hardware screen improvements (#7843)

Browse source 
Move some items in 212 radio right
Fix X9E BT mode issue
This commit is contained in:
3djc 2020-07-31 15:57:54 +02:00 • committed by GitHub
parent a73a79fb02
commit d086cfb9eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
radio/src/dataconstants.h
View file

@ -893,6 +893,11 @@ enum BluetoothModes {
BLUETOOTH_OFF, BLUETOOTH_OFF,
BLUETOOTH_TELEMETRY, BLUETOOTH_TELEMETRY,
BLUETOOTH_TRAINER, BLUETOOTH_TRAINER,
#if defined(PCBX9E)
BLUETOOTH_MAX=BLUETOOTH_TELEMETRY
#else
BLUETOOTH_MAX=BLUETOOTH_TRAINER
#endif
}; };
// PXX2 constants // PXX2 constants

2
radio/src/gui/480x272/radio_hardware.cpp
View file

@ -325,7 +325,7 @@ bool menuRadioHardware(event_t event)
#if defined(BLUETOOTH) #if defined(BLUETOOTH)
case ITEM_RADIO_HARDWARE_BLUETOOTH_MODE: case ITEM_RADIO_HARDWARE_BLUETOOTH_MODE:
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_BLUETOOTH); 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; break;
case ITEM_RADIO_HARDWARE_BLUETOOTH_PAIRING_CODE: case ITEM_RADIO_HARDWARE_BLUETOOTH_PAIRING_CODE:

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

@ -292,7 +292,7 @@ void onHardwareAntennaSwitchConfirm(const char * result)
#if LCD_W >= 212 #if LCD_W >= 212
#define HW_SETTINGS_COLUMN1 12*FW #define HW_SETTINGS_COLUMN1 12*FW
#define HW_SETTINGS_COLUMN2 (HW_SETTINGS_COLUMN1 + 6*FW) #define HW_SETTINGS_COLUMN2 (20*FW - 3)
#else #else
#define HW_SETTINGS_COLUMN1 30 #define HW_SETTINGS_COLUMN1 30
#define HW_SETTINGS_COLUMN2 (HW_SETTINGS_COLUMN1 + 5*FW) #define HW_SETTINGS_COLUMN2 (HW_SETTINGS_COLUMN1 + 5*FW)
@ -569,7 +569,7 @@ void menuRadioHardware(event_t event)
lcdDrawTextAlignedLeft(y, STR_BLUETOOTH); lcdDrawTextAlignedLeft(y, STR_BLUETOOTH);
lcdDrawTextAtIndex(HW_SETTINGS_COLUMN2, y, STR_BLUETOOTH_MODES, g_eeGeneral.bluetoothMode, attr); lcdDrawTextAtIndex(HW_SETTINGS_COLUMN2, y, STR_BLUETOOTH_MODES, g_eeGeneral.bluetoothMode, attr);
if (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; break;

2
radio/src/translations/en.h.txt
View file

@ -925,7 +925,7 @@
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN BUTTON("Reset") #define TR_RESET_BTN BUTTON("Reset")
#define TR_DEBUG "Debug" #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_ANALOGS_BTN BUTTON(TR("Anas", "Analogs"))
#define TR_TOUCH_NOTFOUND "Touch hardware not found" #define TR_TOUCH_NOTFOUND "Touch hardware not found"
#define TR_TOUCH_EXIT "Touch screen to exit" #define TR_TOUCH_EXIT "Touch screen to exit"

6
radio/src/translations/it.h.txt
View file

@ -940,8 +940,8 @@
#define TR_DEL_BUTTON BUTTON(TR("Canc.", "Cancella")) #define TR_DEL_BUTTON BUTTON(TR("Canc.", "Cancella"))
#define TR_RESET_BTN "[Reset]" #define TR_RESET_BTN "[Reset]"
#define TR_DEBUG "Debug" #define TR_DEBUG "Debug"
#define TR_KEYS_BTN BUTTON(TR("SW","Interruttori")) #define TR_KEYS_BTN BUTTON(TR("SW", "Tasti"))
#define TR_ANALOGS_BTN BUTTON(TR("Analogico","Analogici")) #define TR_ANALOGS_BTN BUTTON("Analogici")
#define TR_TOUCH_NOTFOUND "Schermo touch non trovato" #define TR_TOUCH_NOTFOUND "Schermo touch non trovato"
#define TR_TOUCH_EXIT "Tocca lo schermo per uscire" #define TR_TOUCH_EXIT "Tocca lo schermo per uscire"
#define TR_CALIBRATION TR("Calibraz.", "Calibrazione") #define TR_CALIBRATION TR("Calibraz.", "Calibrazione")
@ -1220,7 +1220,7 @@
#define TR_MENU_OTHER "Altro" #define TR_MENU_OTHER "Altro"
#define TR_MENU_INVERT "Inverti" #define TR_MENU_INVERT "Inverti"
#define TR_JITTER_FILTER "Filtro ADC" #define TR_JITTER_FILTER "Filtro ADC"
#define TR_RTC_CHECK TR("Controllo RTC", "Controllo voltaggio RTC") #define TR_RTC_CHECK TR("Controllo RTC", "Controllo volt. RTC")
#define TR_AUTH_FAILURE "Auth-failure" #define TR_AUTH_FAILURE "Auth-failure"
#define ZSTR_VFR "VFR" #define ZSTR_VFR "VFR"