mirror of
https://github.com/opentx/opentx.git
synced 2025-07-25 17:25:13 +03:00
Prevent X9E simu crash when BT is enabled (#5966)
* Better 'non horus BT' XE handling * Cleanup * Adjust BT message for X9E * [Companion][HardwarePanel][X9E] Change BT Mode options to OFF/Enabled, X9E only.
This commit is contained in:
parent
7aca3eb5b7
commit
6898efcc02
16 changed files with 66 additions and 129 deletions
|
@ -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)) {
|
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->bluetoothMode->setField(generalSettings.bluetoothMode, this);
|
||||||
ui->bluetoothName->setField(generalSettings.bluetoothName, 10, this);
|
ui->bluetoothName->setField(generalSettings.bluetoothName, 10, this);
|
||||||
}
|
}
|
||||||
|
|
|
@ -149,15 +149,6 @@
|
||||||
<property name="statusTip">
|
<property name="statusTip">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="whatsThis">
|
|
||||||
<string>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.</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="13" column="2">
|
<item row="13" column="2">
|
||||||
|
@ -168,15 +159,6 @@
|
||||||
<property name="statusTip">
|
<property name="statusTip">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="whatsThis">
|
|
||||||
<string>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.</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="34" column="1">
|
<item row="34" column="1">
|
||||||
|
@ -899,15 +881,6 @@
|
||||||
<property name="statusTip">
|
<property name="statusTip">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="whatsThis">
|
|
||||||
<string>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.</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="10" column="2">
|
<item row="10" column="2">
|
||||||
|
@ -918,15 +891,6 @@
|
||||||
<property name="statusTip">
|
<property name="statusTip">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="whatsThis">
|
|
||||||
<string>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.</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="9" column="2">
|
<item row="9" column="2">
|
||||||
|
@ -937,15 +901,6 @@
|
||||||
<property name="statusTip">
|
<property name="statusTip">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="whatsThis">
|
|
||||||
<string>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.</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="8" column="2">
|
<item row="8" column="2">
|
||||||
|
@ -956,15 +911,6 @@
|
||||||
<property name="statusTip">
|
<property name="statusTip">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="whatsThis">
|
|
||||||
<string>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.</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="7" column="2">
|
<item row="7" column="2">
|
||||||
|
@ -975,15 +921,6 @@
|
||||||
<property name="statusTip">
|
<property name="statusTip">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="whatsThis">
|
|
||||||
<string>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.</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="6" column="2">
|
<item row="6" column="2">
|
||||||
|
@ -994,15 +931,6 @@
|
||||||
<property name="statusTip">
|
<property name="statusTip">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="whatsThis">
|
|
||||||
<string>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.</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="5" column="2">
|
<item row="5" column="2">
|
||||||
|
@ -1013,15 +941,6 @@
|
||||||
<property name="statusTip">
|
<property name="statusTip">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="whatsThis">
|
|
||||||
<string>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.</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="4" column="2">
|
<item row="4" column="2">
|
||||||
|
@ -1032,15 +951,6 @@
|
||||||
<property name="statusTip">
|
<property name="statusTip">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="whatsThis">
|
|
||||||
<string>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.</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="32" column="0">
|
<item row="32" column="0">
|
||||||
|
@ -1103,21 +1013,6 @@
|
||||||
<property name="text" stdset="0">
|
<property name="text" stdset="0">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>OFF</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Telemetry</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>Trainer</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
|
|
|
@ -262,6 +262,7 @@ void bluetoothReceiveTrainer()
|
||||||
#if defined(PCBX9E) && !defined(USEHORUSBT)
|
#if defined(PCBX9E) && !defined(USEHORUSBT)
|
||||||
void bluetoothWakeup(void)
|
void bluetoothWakeup(void)
|
||||||
{
|
{
|
||||||
|
#if !defined(SIMU)
|
||||||
if (!g_eeGeneral.bluetoothMode) {
|
if (!g_eeGeneral.bluetoothMode) {
|
||||||
if (bluetoothState != BLUETOOTH_INIT) {
|
if (bluetoothState != BLUETOOTH_INIT) {
|
||||||
bluetoothDone();
|
bluetoothDone();
|
||||||
|
@ -317,6 +318,7 @@ void bluetoothWakeup(void)
|
||||||
bluetoothSendTrainer();
|
bluetoothSendTrainer();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#else // PCBX9E
|
#else // PCBX9E
|
||||||
void bluetoothWakeup()
|
void bluetoothWakeup()
|
||||||
|
|
|
@ -55,7 +55,9 @@ enum menuRadioHwItems {
|
||||||
CASE_PCBX9E(ITEM_RADIO_HARDWARE_SQ)
|
CASE_PCBX9E(ITEM_RADIO_HARDWARE_SQ)
|
||||||
CASE_PCBX9E(ITEM_RADIO_HARDWARE_SR)
|
CASE_PCBX9E(ITEM_RADIO_HARDWARE_SR)
|
||||||
CASE_BLUETOOTH(ITEM_RADIO_HARDWARE_BLUETOOTH_MODE)
|
CASE_BLUETOOTH(ITEM_RADIO_HARDWARE_BLUETOOTH_MODE)
|
||||||
|
#if defined(USEHORUSBT)
|
||||||
CASE_BLUETOOTH(ITEM_RADIO_HARDWARE_BLUETOOTH_NAME)
|
CASE_BLUETOOTH(ITEM_RADIO_HARDWARE_BLUETOOTH_NAME)
|
||||||
|
#endif
|
||||||
ITEM_RADIO_HARDWARE_UART3_MODE,
|
ITEM_RADIO_HARDWARE_UART3_MODE,
|
||||||
ITEM_RADIO_HARDWARE_JITTER_FILTER,
|
ITEM_RADIO_HARDWARE_JITTER_FILTER,
|
||||||
ITEM_RADIO_HARDWARE_MAX
|
ITEM_RADIO_HARDWARE_MAX
|
||||||
|
@ -80,7 +82,7 @@ enum menuRadioHwItems {
|
||||||
#if defined(BLUETOOTH) && defined(USEHORUSBT)
|
#if defined(BLUETOOTH) && defined(USEHORUSBT)
|
||||||
#define BLUETOOTH_ROWS 0, uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? -1 : 0),
|
#define BLUETOOTH_ROWS 0, uint8_t(g_eeGeneral.bluetoothMode == BLUETOOTH_OFF ? -1 : 0),
|
||||||
#else
|
#else
|
||||||
#define BLUETOOTH_ROWS
|
#define BLUETOOTH_ROWS (uint8_t)0,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define SWITCH_TYPE_MAX(sw) ((MIXSRC_SF-MIXSRC_FIRST_SWITCH == sw || MIXSRC_SH-MIXSRC_FIRST_SWITCH == sw) ? SWITCH_2POS : SWITCH_3POS)
|
#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;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(BLUETOOTH) && defined(USEHORUSBT)
|
#if defined(BLUETOOTH)
|
||||||
case ITEM_RADIO_HARDWARE_BLUETOOTH_MODE:
|
case ITEM_RADIO_HARDWARE_BLUETOOTH_MODE:
|
||||||
lcdDrawText(INDENT_WIDTH, y, STR_BLUETOOTH);
|
lcdDrawText(INDENT_WIDTH, y, STR_BLUETOOTH);
|
||||||
lcdDrawTextAtIndex(HW_SETTINGS_COLUMN, y, STR_BLUETOOTH_MODES, g_eeGeneral.bluetoothMode, attr);
|
lcdDrawTextAtIndex(HW_SETTINGS_COLUMN, y, STR_BLUETOOTH_MODES, g_eeGeneral.bluetoothMode, attr);
|
||||||
if (attr) {
|
if (attr) {
|
||||||
|
#if defined(USEHORUSBT)
|
||||||
g_eeGeneral.bluetoothMode = checkIncDecGen(event, g_eeGeneral.bluetoothMode, BLUETOOTH_OFF, BLUETOOTH_TRAINER);
|
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;
|
break;
|
||||||
|
#if defined(USEHORUSBT)
|
||||||
case ITEM_RADIO_HARDWARE_BLUETOOTH_NAME:
|
case ITEM_RADIO_HARDWARE_BLUETOOTH_NAME:
|
||||||
lcdDrawText(INDENT_WIDTH, y, STR_NAME);
|
lcdDrawText(INDENT_WIDTH, y, STR_NAME);
|
||||||
editName(HW_SETTINGS_COLUMN, y, g_eeGeneral.bluetoothName, LEN_BLUETOOTH_NAME, event, attr);
|
editName(HW_SETTINGS_COLUMN, y, g_eeGeneral.bluetoothName, LEN_BLUETOOTH_NAME, event, attr);
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
case ITEM_RADIO_HARDWARE_UART3_MODE:
|
case ITEM_RADIO_HARDWARE_UART3_MODE:
|
||||||
|
|
|
@ -155,7 +155,7 @@
|
||||||
#define CASE_SDCARD(x)
|
#define CASE_SDCARD(x)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(BLUETOOTH) && !(defined(PCBX9E) && !defined(USEHORUSBT))
|
#if defined(BLUETOOTH)
|
||||||
#define CASE_BLUETOOTH(x) x,
|
#define CASE_BLUETOOTH(x) x,
|
||||||
#else
|
#else
|
||||||
#define CASE_BLUETOOTH(x)
|
#define CASE_BLUETOOTH(x)
|
||||||
|
@ -203,12 +203,6 @@
|
||||||
#define CASE_PCBX9E(x)
|
#define CASE_PCBX9E(x)
|
||||||
#endif
|
#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)
|
#if defined(PCBSKY9X) && !defined(AR9X) && !defined(REVA)
|
||||||
#define TX_CAPACITY_MEASUREMENT
|
#define TX_CAPACITY_MEASUREMENT
|
||||||
#define CASE_CAPACITY(x) x,
|
#define CASE_CAPACITY(x) x,
|
||||||
|
|
|
@ -980,8 +980,11 @@
|
||||||
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
||||||
#define TR_BAUDRATE "BT Baudrate"
|
#define TR_BAUDRATE "BT Baudrate"
|
||||||
#define LEN_BLUETOOTH_MODES "\011"
|
#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"
|
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
|
||||||
|
#endif
|
||||||
#define TR_SD_INFO_TITLE "SD INFO"
|
#define TR_SD_INFO_TITLE "SD INFO"
|
||||||
#define TR_SD_TYPE "Typ:"
|
#define TR_SD_TYPE "Typ:"
|
||||||
#define TR_SD_SPEED "Rychlost:"
|
#define TR_SD_SPEED "Rychlost:"
|
||||||
|
|
|
@ -997,9 +997,11 @@
|
||||||
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
||||||
#define TR_BAUDRATE "BT Baudrate"
|
#define TR_BAUDRATE "BT Baudrate"
|
||||||
#define LEN_BLUETOOTH_MODES "\011"
|
#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_INFO_TITLE "SD-INFO"
|
||||||
#define TR_SD_TYPE "Typ:"
|
#define TR_SD_TYPE "Typ:"
|
||||||
#define TR_SD_SPEED "Geschw:"
|
#define TR_SD_SPEED "Geschw:"
|
||||||
|
|
|
@ -985,8 +985,11 @@
|
||||||
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
||||||
#define TR_BAUDRATE "BT Baudrate"
|
#define TR_BAUDRATE "BT Baudrate"
|
||||||
#define LEN_BLUETOOTH_MODES "\011"
|
#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"
|
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
|
||||||
|
#endif
|
||||||
#define TR_SD_INFO_TITLE "SD INFO"
|
#define TR_SD_INFO_TITLE "SD INFO"
|
||||||
#define TR_SD_TYPE "Type:"
|
#define TR_SD_TYPE "Type:"
|
||||||
#define TR_SD_SPEED "Speed:"
|
#define TR_SD_SPEED "Speed:"
|
||||||
|
|
|
@ -976,8 +976,11 @@
|
||||||
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
||||||
#define TR_BAUDRATE "BT Baudrate"
|
#define TR_BAUDRATE "BT Baudrate"
|
||||||
#define LEN_BLUETOOTH_MODES "\011"
|
#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"
|
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
|
||||||
|
#endif
|
||||||
#define TR_SD_INFO_TITLE "SD INFO"
|
#define TR_SD_INFO_TITLE "SD INFO"
|
||||||
#define TR_SD_TYPE "Tipo:"
|
#define TR_SD_TYPE "Tipo:"
|
||||||
#define TR_SD_SPEED "Velocidad:"
|
#define TR_SD_SPEED "Velocidad:"
|
||||||
|
|
|
@ -968,8 +968,11 @@
|
||||||
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
||||||
#define TR_BAUDRATE "BT Baudrate"
|
#define TR_BAUDRATE "BT Baudrate"
|
||||||
#define LEN_BLUETOOTH_MODES "\011"
|
#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"
|
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
|
||||||
|
#endif
|
||||||
#define TR_SD_INFO_TITLE "SD INFO"
|
#define TR_SD_INFO_TITLE "SD INFO"
|
||||||
#define TR_SD_TYPE "Type:"
|
#define TR_SD_TYPE "Type:"
|
||||||
#define TR_SD_SPEED "Speed:"
|
#define TR_SD_SPEED "Speed:"
|
||||||
|
|
|
@ -1005,7 +1005,11 @@
|
||||||
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
||||||
#define TR_BAUDRATE "Baudrate BT"
|
#define TR_BAUDRATE "Baudrate BT"
|
||||||
#define LEN_BLUETOOTH_MODES "\012"
|
#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"
|
#define TR_BLUETOOTH_MODES "---\0 ""Télémétrie""Ecolage\0"
|
||||||
|
#endif
|
||||||
#define TR_SD_INFO_TITLE "INFO SD"
|
#define TR_SD_INFO_TITLE "INFO SD"
|
||||||
#define TR_SD_TYPE "Type:"
|
#define TR_SD_TYPE "Type:"
|
||||||
#define TR_SD_SPEED "Vitesse:"
|
#define TR_SD_SPEED "Vitesse:"
|
||||||
|
|
|
@ -993,8 +993,11 @@
|
||||||
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
||||||
#define TR_BAUDRATE "BT Baudrate"
|
#define TR_BAUDRATE "BT Baudrate"
|
||||||
#define LEN_BLUETOOTH_MODES "\011"
|
#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"
|
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
|
||||||
|
#endif
|
||||||
#define TR_SD_INFO_TITLE "SD INFO"
|
#define TR_SD_INFO_TITLE "SD INFO"
|
||||||
#define TR_SD_TYPE "Tipo:"
|
#define TR_SD_TYPE "Tipo:"
|
||||||
#define TR_SD_SPEED "Veloc.:"
|
#define TR_SD_SPEED "Veloc.:"
|
||||||
|
|
|
@ -984,8 +984,11 @@
|
||||||
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
||||||
#define TR_BAUDRATE "BT Baudrate"
|
#define TR_BAUDRATE "BT Baudrate"
|
||||||
#define LEN_BLUETOOTH_MODES "\011"
|
#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"
|
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
|
||||||
|
#endif
|
||||||
#define TR_SD_INFO_TITLE "SD-INFO"
|
#define TR_SD_INFO_TITLE "SD-INFO"
|
||||||
#define TR_SD_TYPE "Type:"
|
#define TR_SD_TYPE "Type:"
|
||||||
#define TR_SD_SPEED "Snelheid:"
|
#define TR_SD_SPEED "Snelheid:"
|
||||||
|
|
|
@ -995,9 +995,11 @@
|
||||||
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
||||||
#define TR_BAUDRATE "Prędkość BT"
|
#define TR_BAUDRATE "Prędkość BT"
|
||||||
#define LEN_BLUETOOTH_MODES "\011"
|
#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"
|
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
|
||||||
|
#endif
|
||||||
|
|
||||||
#define TR_SD_INFO_TITLE "SD INFO"
|
#define TR_SD_INFO_TITLE "SD INFO"
|
||||||
#define TR_SD_TYPE "Typ:"
|
#define TR_SD_TYPE "Typ:"
|
||||||
#define TR_SD_SPEED "Prędkość:"
|
#define TR_SD_SPEED "Prędkość:"
|
||||||
|
|
|
@ -975,8 +975,11 @@
|
||||||
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
||||||
#define TR_BAUDRATE "BT Baudrate"
|
#define TR_BAUDRATE "BT Baudrate"
|
||||||
#define LEN_BLUETOOTH_MODES "\011"
|
#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"
|
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
|
||||||
|
#endif
|
||||||
#define TR_SD_INFO_TITLE "SD INFO"
|
#define TR_SD_INFO_TITLE "SD INFO"
|
||||||
#define TR_SD_TYPE "Tipe"
|
#define TR_SD_TYPE "Tipe"
|
||||||
#define TR_SD_SPEED "Velocidade"
|
#define TR_SD_SPEED "Velocidade"
|
||||||
|
|
|
@ -1003,8 +1003,11 @@
|
||||||
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
#define TR_BLUETOOTH_PIN_CODE TR(INDENT "PIN code", "PIN code")
|
||||||
#define TR_BAUDRATE "BT Baudrate"
|
#define TR_BAUDRATE "BT Baudrate"
|
||||||
#define LEN_BLUETOOTH_MODES "\011"
|
#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"
|
#define TR_BLUETOOTH_MODES "---\0 ""Telemetry""Trainer\0"
|
||||||
|
#endif
|
||||||
#define TR_SD_INFO_TITLE "SD INFO"
|
#define TR_SD_INFO_TITLE "SD INFO"
|
||||||
#define TR_SD_TYPE "Typ: "
|
#define TR_SD_TYPE "Typ: "
|
||||||
#define TR_SD_SPEED "Hastighet:"
|
#define TR_SD_SPEED "Hastighet:"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue