diff --git a/companion/src/generaledit/hardware.cpp b/companion/src/generaledit/hardware.cpp index d8ae948e7..1d131e1e0 100644 --- a/companion/src/generaledit/hardware.cpp +++ b/companion/src/generaledit/hardware.cpp @@ -158,7 +158,14 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings } if (IS_TARANIS_X7(board) || IS_TARANIS_XLITE(board)|| IS_TARANIS_X9E(board) || IS_HORUS(board)) { - ui->bluetoothMode->setAutoIndexes(); + ui->bluetoothMode->addItem(tr("OFF"), 0); + if (IS_TARANIS_X9E(board)) { + ui->bluetoothMode->addItem(tr("Enabled"), 1); + } + else { + ui->bluetoothMode->addItem(tr("Telemetry"), 1); + ui->bluetoothMode->addItem(tr("Trainer"), 2); + } ui->bluetoothMode->setField(generalSettings.bluetoothMode, this); ui->bluetoothName->setField(generalSettings.bluetoothName, 10, this); } diff --git a/companion/src/generaledit/hardware.ui b/companion/src/generaledit/hardware.ui index 872e96ad5..3a54521ba 100644 --- a/companion/src/generaledit/hardware.ui +++ b/companion/src/generaledit/hardware.ui @@ -149,15 +149,6 @@ - - Beeper volume - -0 - Quiet. No beeps at all. -1 - No Keys. Normal beeps but menu keys do not beep. -2 - Normal. -3 - Loud. -4 - Extra loud. - @@ -168,15 +159,6 @@ - - Beeper volume - -0 - Quiet. No beeps at all. -1 - No Keys. Normal beeps but menu keys do not beep. -2 - Normal. -3 - Loud. -4 - Extra loud. - @@ -899,15 +881,6 @@ - - Beeper volume - -0 - Quiet. No beeps at all. -1 - No Keys. Normal beeps but menu keys do not beep. -2 - Normal. -3 - Loud. -4 - Extra loud. - @@ -918,15 +891,6 @@ - - Beeper volume - -0 - Quiet. No beeps at all. -1 - No Keys. Normal beeps but menu keys do not beep. -2 - Normal. -3 - Loud. -4 - Extra loud. - @@ -937,15 +901,6 @@ - - Beeper volume - -0 - Quiet. No beeps at all. -1 - No Keys. Normal beeps but menu keys do not beep. -2 - Normal. -3 - Loud. -4 - Extra loud. - @@ -956,15 +911,6 @@ - - Beeper volume - -0 - Quiet. No beeps at all. -1 - No Keys. Normal beeps but menu keys do not beep. -2 - Normal. -3 - Loud. -4 - Extra loud. - @@ -975,15 +921,6 @@ - - Beeper volume - -0 - Quiet. No beeps at all. -1 - No Keys. Normal beeps but menu keys do not beep. -2 - Normal. -3 - Loud. -4 - Extra loud. - @@ -994,15 +931,6 @@ - - Beeper volume - -0 - Quiet. No beeps at all. -1 - No Keys. Normal beeps but menu keys do not beep. -2 - Normal. -3 - Loud. -4 - Extra loud. - @@ -1013,15 +941,6 @@ - - Beeper volume - -0 - Quiet. No beeps at all. -1 - No Keys. Normal beeps but menu keys do not beep. -2 - Normal. -3 - Loud. -4 - Extra loud. - @@ -1032,15 +951,6 @@ - - Beeper volume - -0 - Quiet. No beeps at all. -1 - No Keys. Normal beeps but menu keys do not beep. -2 - Normal. -3 - Loud. -4 - Extra loud. - @@ -1103,21 +1013,6 @@ - - - OFF - - - - - Telemetry - - - - - Trainer - - diff --git a/radio/src/bluetooth.cpp b/radio/src/bluetooth.cpp index 8a5c3c948..50bc769bd 100644 --- a/radio/src/bluetooth.cpp +++ b/radio/src/bluetooth.cpp @@ -262,6 +262,7 @@ void bluetoothReceiveTrainer() #if defined(PCBX9E) && !defined(USEHORUSBT) void bluetoothWakeup(void) { +#if !defined(SIMU) if (!g_eeGeneral.bluetoothMode) { if (bluetoothState != BLUETOOTH_INIT) { bluetoothDone(); @@ -317,6 +318,7 @@ void bluetoothWakeup(void) bluetoothSendTrainer(); } } +#endif } #else // PCBX9E void bluetoothWakeup() diff --git a/radio/src/gui/212x64/radio_hardware.cpp b/radio/src/gui/212x64/radio_hardware.cpp index f73f9c7ea..7a9c9cda1 100644 --- a/radio/src/gui/212x64/radio_hardware.cpp +++ b/radio/src/gui/212x64/radio_hardware.cpp @@ -55,7 +55,9 @@ enum menuRadioHwItems { CASE_PCBX9E(ITEM_RADIO_HARDWARE_SQ) CASE_PCBX9E(ITEM_RADIO_HARDWARE_SR) CASE_BLUETOOTH(ITEM_RADIO_HARDWARE_BLUETOOTH_MODE) +#if defined(USEHORUSBT) CASE_BLUETOOTH(ITEM_RADIO_HARDWARE_BLUETOOTH_NAME) +#endif ITEM_RADIO_HARDWARE_UART3_MODE, ITEM_RADIO_HARDWARE_JITTER_FILTER, ITEM_RADIO_HARDWARE_MAX @@ -80,7 +82,7 @@ enum menuRadioHwItems { #if defined(BLUETOOTH) && defined(USEHORUSBT) #define BLUETOOTH_ROWS 0, uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? -1 : 0), #else - #define BLUETOOTH_ROWS + #define BLUETOOTH_ROWS (uint8_t)0, #endif #define SWITCH_TYPE_MAX(sw) ((MIXSRC_SF-MIXSRC_FIRST_SWITCH == sw || MIXSRC_SH-MIXSRC_FIRST_SWITCH == sw) ? SWITCH_2POS : SWITCH_3POS) @@ -198,19 +200,24 @@ void menuRadioHardware(event_t event) break; } -#if defined(BLUETOOTH) && defined(USEHORUSBT) +#if defined(BLUETOOTH) case ITEM_RADIO_HARDWARE_BLUETOOTH_MODE: lcdDrawText(INDENT_WIDTH, y, STR_BLUETOOTH); lcdDrawTextAtIndex(HW_SETTINGS_COLUMN, y, STR_BLUETOOTH_MODES, g_eeGeneral.bluetoothMode, attr); if (attr) { +#if defined(USEHORUSBT) g_eeGeneral.bluetoothMode = checkIncDecGen(event, g_eeGeneral.bluetoothMode, BLUETOOTH_OFF, BLUETOOTH_TRAINER); +#else + g_eeGeneral.bluetoothMode = checkIncDecGen(event, g_eeGeneral.bluetoothMode, BLUETOOTH_OFF, BLUETOOTH_TELEMETRY); +#endif } break; - +#if defined(USEHORUSBT) case ITEM_RADIO_HARDWARE_BLUETOOTH_NAME: lcdDrawText(INDENT_WIDTH, y, STR_NAME); editName(HW_SETTINGS_COLUMN, y, g_eeGeneral.bluetoothName, LEN_BLUETOOTH_NAME, event, attr); break; +#endif #endif case ITEM_RADIO_HARDWARE_UART3_MODE: diff --git a/radio/src/opentx.h b/radio/src/opentx.h index fbf39a28e..7a4195ea1 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -155,7 +155,7 @@ #define CASE_SDCARD(x) #endif -#if defined(BLUETOOTH) && !(defined(PCBX9E) && !defined(USEHORUSBT)) +#if defined(BLUETOOTH) #define CASE_BLUETOOTH(x) x, #else #define CASE_BLUETOOTH(x) @@ -203,12 +203,6 @@ #define CASE_PCBX9E(x) #endif -#if defined(BLUETOOTH) && !(defined(PCBX9E) && !defined(USEHORUSBT)) - #define CASE_BLUETOOTH(x) x, -#else - #define CASE_BLUETOOTH(x) -#endif - #if defined(PCBSKY9X) && !defined(AR9X) && !defined(REVA) #define TX_CAPACITY_MEASUREMENT #define CASE_CAPACITY(x) x, diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 16a77d137..ee4646747 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -980,8 +980,11 @@ #define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code") #define TR_BAUDRATE "BT Baudrate" #define LEN_BLUETOOTH_MODES "\011" +#if defined(PCBX9E) && !defined(USEHORUSBT) +#define TR_BLUETOOTH_MODES "---\0 ""Enabled\0 " +#else #define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0" - +#endif #define TR_SD_INFO_TITLE "SD INFO" #define TR_SD_TYPE "Typ:" #define TR_SD_SPEED "Rychlost:" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 09c7033b9..f0b315374 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -997,9 +997,11 @@ #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" - - +##if defined(PCBX9E) && !defined(USEHORUSBT) + #define TR_BLUETOOTH_MODES "---\0 ""Enabled\0 " + #else + #define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0" + #endif #define TR_SD_INFO_TITLE "SD-INFO" #define TR_SD_TYPE "Typ:" #define TR_SD_SPEED "Geschw:" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 7ab20cb4d..2baca31a4 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -985,8 +985,11 @@ #define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code") #define TR_BAUDRATE "BT Baudrate" #define LEN_BLUETOOTH_MODES "\011" +#if defined(PCBX9E) && !defined(USEHORUSBT) +#define TR_BLUETOOTH_MODES "---\0 ""Enabled\0 " +#else #define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0" - +#endif #define TR_SD_INFO_TITLE "SD INFO" #define TR_SD_TYPE "Type:" #define TR_SD_SPEED "Speed:" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index b240fdae0..08d6529ce 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -976,8 +976,11 @@ #define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code") #define TR_BAUDRATE "BT Baudrate" #define LEN_BLUETOOTH_MODES "\011" +#if defined(PCBX9E) && !defined(USEHORUSBT) +#define TR_BLUETOOTH_MODES "---\0 ""Enabled\0 " +#else #define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0" - +#endif #define TR_SD_INFO_TITLE "SD INFO" #define TR_SD_TYPE "Tipo:" #define TR_SD_SPEED "Velocidad:" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 1acf211a3..64ffa8f49 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -968,8 +968,11 @@ #define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code") #define TR_BAUDRATE "BT Baudrate" #define LEN_BLUETOOTH_MODES "\011" +#if defined(PCBX9E) && !defined(USEHORUSBT) +#define TR_BLUETOOTH_MODES "---\0 ""Enabled\0 " +#else #define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0" - +#endif #define TR_SD_INFO_TITLE "SD INFO" #define TR_SD_TYPE "Type:" #define TR_SD_SPEED "Speed:" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 26d823549..030ba61ef 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -1005,7 +1005,11 @@ #define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code") #define TR_BAUDRATE "Baudrate BT" #define LEN_BLUETOOTH_MODES "\012" +#if defined(PCBX9E) && !defined(USEHORUSBT) +#define TR_BLUETOOTH_MODES "---\0 ""Activé\0 " +#else #define TR_BLUETOOTH_MODES "---\0 ""Télémétrie""Ecolage\0" +#endif #define TR_SD_INFO_TITLE "INFO SD" #define TR_SD_TYPE "Type:" #define TR_SD_SPEED "Vitesse:" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 7b6cfb45f..5aa820393 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -993,8 +993,11 @@ #define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code") #define TR_BAUDRATE "BT Baudrate" #define LEN_BLUETOOTH_MODES "\011" +#if defined(PCBX9E) && !defined(USEHORUSBT) +#define TR_BLUETOOTH_MODES "---\0 ""Enabled\0 " +#else #define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0" - +#endif #define TR_SD_INFO_TITLE "SD INFO" #define TR_SD_TYPE "Tipo:" #define TR_SD_SPEED "Veloc.:" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 083654567..1038251ed 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -984,8 +984,11 @@ #define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code") #define TR_BAUDRATE "BT Baudrate" #define LEN_BLUETOOTH_MODES "\011" +#if defined(PCBX9E) && !defined(USEHORUSBT) +#define TR_BLUETOOTH_MODES "---\0 ""Enabled\0 " +#else #define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0" - +#endif #define TR_SD_INFO_TITLE "SD-INFO" #define TR_SD_TYPE "Type:" #define TR_SD_SPEED "Snelheid:" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 2e645b705..6543e927a 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -995,9 +995,11 @@ #define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code") #define TR_BAUDRATE "Prędkość BT" #define LEN_BLUETOOTH_MODES "\011" +#if defined(PCBX9E) && !defined(USEHORUSBT) +#define TR_BLUETOOTH_MODES "---\0 ""Enabled\0 " +#else #define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0" - - +#endif #define TR_SD_INFO_TITLE "SD INFO" #define TR_SD_TYPE "Typ:" #define TR_SD_SPEED "Prędkość:" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 3e10bc778..00d28a5b5 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -975,8 +975,11 @@ #define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code") #define TR_BAUDRATE "BT Baudrate" #define LEN_BLUETOOTH_MODES "\011" +#if defined(PCBX9E) && !defined(USEHORUSBT) +#define TR_BLUETOOTH_MODES "---\0 ""Enabled\0 " +#else #define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0" - +#endif #define TR_SD_INFO_TITLE "SD INFO" #define TR_SD_TYPE "Tipe" #define TR_SD_SPEED "Velocidade" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 20dd50685..a11fd3c76 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -1003,8 +1003,11 @@ #define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code") #define TR_BAUDRATE "BT Baudrate" #define LEN_BLUETOOTH_MODES "\011" +#if defined(PCBX9E) && !defined(USEHORUSBT) +#define TR_BLUETOOTH_MODES "---\0 ""Enabled\0 " +#else #define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0" - +#endif #define TR_SD_INFO_TITLE "SD INFO" #define TR_SD_TYPE "Typ: " #define TR_SD_SPEED "Hastighet:"