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

BT Pin code (#5536)

Browse Source 
* x7

* add x12 pin code
make strings translatable

* Cosmetics
This commit is contained in:
3djc
2017-12-18 21:03:18 +01:00
committed by Bertrand Songis
parent 394bc1689f
commit 4df64695c7
16 changed files with 119 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/radio_hardware.cpp
+9 -3
View File
@@ -114,6 +114,7 @@ enum MenuRadioHardwareItems {
ITEM_RADIO_HARDWARE_SERIAL_BAUDRATE,
#if defined(BLUETOOTH)
ITEM_RADIO_HARDWARE_BLUETOOTH_MODE,
ITEM_RADIO_HARDWARE_BLUETOOTH_PAIRING_CODE,
ITEM_RADIO_HARDWARE_BLUETOOTH_LOCAL_ADDR,
ITEM_RADIO_HARDWARE_BLUETOOTH_DISTANT_ADDR,
ITEM_RADIO_HARDWARE_BLUETOOTH_NAME,
@@ -125,7 +126,7 @@ enum MenuRadioHardwareItems {
#define POTS_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1
#define SWITCHES_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1
#if defined(PCBX7)
#define BLUETOOTH_ROWS uint8_t(btChipPresent ? 0 : HIDDEN_ROW), uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? HIDDEN_ROW : -1), uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? HIDDEN_ROW : -1), uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? HIDDEN_ROW : 0),
#define BLUETOOTH_ROWS uint8_t(btChipPresent ? 0 : HIDDEN_ROW), uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_TELEMETRY ? -1 : HIDDEN_ROW), uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? HIDDEN_ROW : -1), uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? HIDDEN_ROW : -1), uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? HIDDEN_ROW : 0),
#elif defined(BLUETOOTH)
#define BLUETOOTH_ROWS 0, uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? HIDDEN_ROW : -1), uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? HIDDEN_ROW : -1), uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? HIDDEN_ROW : 0),
#else
@@ -240,13 +241,18 @@ void menuRadioHardware(event_t event)
}
break;
case ITEM_RADIO_HARDWARE_BLUETOOTH_PAIRING_CODE:
lcdDrawTextAlignedLeft(y, STR_BLUETOOTH_PIN_CODE);
lcdDrawText(HW_SETTINGS_COLUMN2, y, "0000");
break;
case ITEM_RADIO_HARDWARE_BLUETOOTH_LOCAL_ADDR:
lcdDrawTextAlignedLeft(y, INDENT "Local addr");
lcdDrawTextAlignedLeft(y, STR_BLUETOOTH_LOCAL_ADDR);
lcdDrawText(HW_SETTINGS_COLUMN2, y, bluetoothLocalAddr[0] == '\0' ? "---" : bluetoothLocalAddr);
break;
case ITEM_RADIO_HARDWARE_BLUETOOTH_DISTANT_ADDR:
lcdDrawTextAlignedLeft(y, INDENT "Dist addr");
lcdDrawTextAlignedLeft(y, STR_BLUETOOTH_DIST_ADDR);
lcdDrawText(HW_SETTINGS_COLUMN2, y, bluetoothDistantAddr[0] == '\0' ? "---" : bluetoothDistantAddr);
break;
radio/src/gui/480x272/model_setup.cpp
+2 -2
View File
@@ -806,9 +806,9 @@ bool menuModelSetup(event_t event)
else {
lcdDrawText(MENUS_MARGIN_LEFT + INDENT_WIDTH, y, "---");
if (bluetoothState < BLUETOOTH_STATE_IDLE)
drawButton(MODEL_SETUP_2ND_COLUMN, y, "Init", attr);
drawButton(MODEL_SETUP_2ND_COLUMN, y, STR_BLUETOOTH_INIT, attr);
else
drawButton(MODEL_SETUP_2ND_COLUMN, y, "Discover", attr);
drawButton(MODEL_SETUP_2ND_COLUMN, y, STR_BLUETOOTH_DISC, attr);
if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) {
if (bluetoothState < BLUETOOTH_STATE_IDLE)
bluetoothState = BLUETOOTH_STATE_OFF;
radio/src/gui/480x272/radio_hardware.cpp
+7 -1
View File
@@ -48,6 +48,7 @@ enum MenuRadioHardwareItems {
ITEM_RADIO_HARDWARE_SH,
ITEM_RADIO_HARDWARE_SERIAL_BAUDRATE,
ITEM_RADIO_HARDWARE_BLUETOOTH_MODE,
ITEM_RADIO_HARDWARE_BLUETOOTH_PAIRING_CODE,
ITEM_RADIO_HARDWARE_BLUETOOTH_NAME,
#if defined(SERIAL2) && defined(DEBUG)
ITEM_RADIO_HARDWARE_UART3_MODE,
@@ -64,7 +65,7 @@ enum MenuRadioHardwareItems {
#define POTS_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1
#endif
#define SWITCHES_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1
#define BLUETOOTH_ROWS 0, uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? -1 : 0)
#define BLUETOOTH_ROWS 0, uint8_t(g_eeGeneral.bluetoothMode != BLUETOOTH_TELEMETRY ? HIDDEN_ROW : -1), uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? -1 : 0)
#define SWITCH_TYPE_MAX(sw) ((MIXSRC_SF-MIXSRC_FIRST_SWITCH == sw || MIXSRC_SH-MIXSRC_FIRST_SWITCH == sw) ? SWITCH_2POS : SWITCH_3POS)
bool menuRadioHardware(event_t event)
@@ -192,6 +193,11 @@ bool menuRadioHardware(event_t event)
g_eeGeneral.bluetoothMode = editChoice(HW_SETTINGS_COLUMN+50, y, STR_BLUETOOTH_MODES, g_eeGeneral.bluetoothMode, BLUETOOTH_OFF, BLUETOOTH_TRAINER, attr, event);
break;
case ITEM_RADIO_HARDWARE_BLUETOOTH_PAIRING_CODE:
lcdDrawText(INDENT_WIDTH, y, STR_BLUETOOTH_PIN_CODE);
lcdDrawText(HW_SETTINGS_COLUMN+50, y, "0000", 0);
break;
case ITEM_RADIO_HARDWARE_BLUETOOTH_NAME:
lcdDrawText(INDENT_WIDTH, y, STR_NAME);
editName(HW_SETTINGS_COLUMN+50, y, g_eeGeneral.bluetoothName, LEN_BLUETOOTH_NAME, event, attr);
radio/src/translations.cpp
+5
View File
@@ -749,6 +749,11 @@ const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR;
#if defined(BLUETOOTH)
const pm_char STR_BLUETOOTH[] PROGMEM = TR_BLUETOOTH;
const pm_char STR_BLUETOOTH_DISC[] PROGMEM = TR_BLUETOOTH_DISC;
const pm_char STR_BLUETOOTH_INIT[] PROGMEM = TR_BLUETOOTH_INIT;
const pm_char STR_BLUETOOTH_DIST_ADDR[] PROGMEM = TR_BLUETOOTH_DIST_ADDR;
const pm_char STR_BLUETOOTH_LOCAL_ADDR[] PROGMEM = TR_BLUETOOTH_LOCAL_ADDR;
const pm_char STR_BLUETOOTH_PIN_CODE[] PROGMEM = TR_BLUETOOTH_PIN_CODE;
#endif
#if defined(TELEMETRY_MAVLINK)
radio/src/translations.h
+5
View File
@@ -370,6 +370,11 @@ extern const pm_char STR_OPEN9X[];
#if defined(BLUETOOTH)
extern const pm_char STR_BLUETOOTH[];
extern const pm_char STR_BLUETOOTH_DISC[];
extern const pm_char STR_BLUETOOTH_INIT[];
extern const pm_char STR_BLUETOOTH_DIST_ADDR[];
extern const pm_char STR_BLUETOOTH_LOCAL_ADDR[];
extern const pm_char STR_BLUETOOTH_PIN_CODE[];
#define STR_BLUETOOTH_MODES (STR_OPEN9X + OFS_BLUETOOTH_MODES)
#endif
radio/src/translations/cz.h.txt
+9 -4
View File
@@ -960,10 +960,15 @@
#define TR_TIME "Čas"
#define TR_MAXBAUDRATE "Max bauds"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BAUDRATE "BT Baudrate"
#define LEN_BLUETOOTH_MODES "\011"
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BLUETOOTH_DISC "Discover"
#define TR_BLUETOOTH_INIT "Init"
#define TR_BLUETOOTH_DIST_ADDR INDENT "Dist addr"
#define TR_BLUETOOTH_LOCAL_ADDR INDENT "Local addr"
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
#define TR_BAUDRATE "BT Baudrate"
#define LEN_BLUETOOTH_MODES "\011"
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
#define TR_SD_INFO_TITLE "SD INFO"
#define TR_SD_TYPE "Typ:"
radio/src/translations/de.h.txt
+9 -4
View File
@@ -979,10 +979,15 @@
#define TR_TIME "Uhrzeit:"
#define TR_MAXBAUDRATE "Max Baud"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BAUDRATE "BT Baudrate"
#define LEN_BLUETOOTH_MODES "\011"
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BLUETOOTH_DISC "Discover"
#define TR_BLUETOOTH_INIT "Init"
#define TR_BLUETOOTH_DIST_ADDR INDENT "Dist addr"
#define TR_BLUETOOTH_LOCAL_ADDR INDENT "Local addr"
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
#define TR_BAUDRATE "BT Baudrate"
#define LEN_BLUETOOTH_MODES "\011"
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
#define TR_SD_INFO_TITLE "SD-INFO"
radio/src/translations/en.h.txt
+5
View File
@@ -963,6 +963,11 @@
#define TR_MAXBAUDRATE "Max bauds"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BLUETOOTH_DISC "Discover"
#define TR_BLUETOOTH_INIT "Init"
#define TR_BLUETOOTH_DIST_ADDR INDENT "Dist addr"
#define TR_BLUETOOTH_LOCAL_ADDR INDENT "Local addr"
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
#define TR_BAUDRATE "BT Baudrate"
#define LEN_BLUETOOTH_MODES "\011"
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
radio/src/translations/es.h.txt
+9 -4
View File
@@ -945,10 +945,15 @@
#define TR_TIME "Hora"
#define TR_MAXBAUDRATE "Max bauds"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BAUDRATE "BT Baudrate"
#define LEN_BLUETOOTH_MODES "\011"
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BLUETOOTH_DISC "Discover"
#define TR_BLUETOOTH_INIT "Init"
#define TR_BLUETOOTH_DIST_ADDR INDENT "Dist addr"
#define TR_BLUETOOTH_LOCAL_ADDR INDENT "Local addr"
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
#define TR_BAUDRATE "BT Baudrate"
#define LEN_BLUETOOTH_MODES "\011"
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
#define TR_SD_INFO_TITLE "SD INFO"
#define TR_SD_TYPE "Tipo:"
radio/src/translations/fi.h.txt
+9 -4
View File
@@ -941,10 +941,15 @@
#define TR_TIME "Time"
#define TR_MAXBAUDRATE "Max bauds"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BAUDRATE "BT Baudrate"
#define LEN_BLUETOOTH_MODES "\011"
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BLUETOOTH_DISC "Discover"
#define TR_BLUETOOTH_INIT "Init"
#define TR_BLUETOOTH_DIST_ADDR INDENT "Dist addr"
#define TR_BLUETOOTH_LOCAL_ADDR INDENT "Local addr"
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
#define TR_BAUDRATE "BT Baudrate"
#define LEN_BLUETOOTH_MODES "\011"
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
#define TR_SD_INFO_TITLE "SD INFO"
#define TR_SD_TYPE "Type:"
radio/src/translations/fr.h.txt
+5
View File
@@ -976,6 +976,11 @@
#define TR_TIME "Heure"
#define TR_MAXBAUDRATE "Max bauds"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BLUETOOTH_DISC "Discover"
#define TR_BLUETOOTH_INIT "Init"
#define TR_BLUETOOTH_DIST_ADDR INDENT "Dist addr"
#define TR_BLUETOOTH_LOCAL_ADDR INDENT "Local addr"
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
#define TR_BAUDRATE "Baudrate BT"
#define LEN_BLUETOOTH_MODES "\012"
#define TR_BLUETOOTH_MODES "---\0 ""Télémétrie""Ecolage\0"
radio/src/translations/it.h.txt
+9 -4
View File
@@ -970,10 +970,15 @@
#define TR_TIME "Ora"
#define TR_MAXBAUDRATE "Max bauds"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BAUDRATE "BT Baudrate"
#define LEN_BLUETOOTH_MODES "\011"
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BLUETOOTH_DISC "Discover"
#define TR_BLUETOOTH_INIT "Init"
#define TR_BLUETOOTH_DIST_ADDR INDENT "Dist addr"
#define TR_BLUETOOTH_LOCAL_ADDR INDENT "Local addr"
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
#define TR_BAUDRATE "BT Baudrate"
#define LEN_BLUETOOTH_MODES "\011"
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
#define TR_SD_INFO_TITLE "SD INFO"
#define TR_SD_TYPE "Tipo:"
radio/src/translations/nl.h.txt
+9 -4
View File
@@ -961,10 +961,15 @@
#define TR_TIME "Tijd:"
#define TR_MAXBAUDRATE "Max bauds"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BAUDRATE "BT Baudrate"
#define LEN_BLUETOOTH_MODES "\011"
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BLUETOOTH_DISC "Discover"
#define TR_BLUETOOTH_INIT "Init"
#define TR_BLUETOOTH_DIST_ADDR INDENT "Dist addr"
#define TR_BLUETOOTH_LOCAL_ADDR INDENT "Local addr"
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
#define TR_BAUDRATE "BT Baudrate"
#define LEN_BLUETOOTH_MODES "\011"
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
#define TR_SD_INFO_TITLE "SD-INFO"
#define TR_SD_TYPE "Type:"
radio/src/translations/pl.h.txt
+9 -4
View File
@@ -972,10 +972,15 @@
#define TR_TIME "Czas"
#define TR_MAXBAUDRATE "Max bauds"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BAUDRATE "Prędkość BT"
#define LEN_BLUETOOTH_MODES "\011"
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BLUETOOTH_DISC "Discover"
#define TR_BLUETOOTH_INIT "Init"
#define TR_BLUETOOTH_DIST_ADDR INDENT "Dist addr"
#define TR_BLUETOOTH_LOCAL_ADDR INDENT "Local addr"
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
#define TR_BAUDRATE "Prędkość BT"
#define LEN_BLUETOOTH_MODES "\011"
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
#define TR_SD_INFO_TITLE "SD INFO"
radio/src/translations/pt.h.txt
+9 -4
View File
@@ -948,10 +948,15 @@
#define TR_TIME "Time"
#define TR_MAXBAUDRATE "Max bauds"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BAUDRATE "BT Baudrate"
#define LEN_BLUETOOTH_MODES "\011"
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BLUETOOTH_DISC "Discover"
#define TR_BLUETOOTH_INIT "Init"
#define TR_BLUETOOTH_DIST_ADDR INDENT "Dist addr"
#define TR_BLUETOOTH_LOCAL_ADDR INDENT "Local addr"
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
#define TR_BAUDRATE "BT Baudrate"
#define LEN_BLUETOOTH_MODES "\011"
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
#define TR_SD_INFO_TITLE "SD INFO"
#define TR_SD_TYPE "Tipe"
radio/src/translations/se.h.txt
+9 -4
View File
@@ -980,10 +980,15 @@
#define TR_TIME "Tid "
#define TR_MAXBAUDRATE "Max bauds"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BAUDRATE "BT Baudrate"
#define LEN_BLUETOOTH_MODES "\011"
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
#define TR_BLUETOOTH "Bluetooth"
#define TR_BLUETOOTH_DISC "Discover"
#define TR_BLUETOOTH_INIT "Init"
#define TR_BLUETOOTH_DIST_ADDR INDENT "Dist addr"
#define TR_BLUETOOTH_LOCAL_ADDR INDENT "Local addr"
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
#define TR_BAUDRATE "BT Baudrate"
#define LEN_BLUETOOTH_MODES "\011"
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
#define TR_SD_INFO_TITLE "SD INFO"
#define TR_SD_TYPE "Typ: "