Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

Prevent X9E simu crash when BT is enabled (#5966)

Browse source 
* 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:
3djc 2018-06-13 22:25:22 +02:00 • committed by Bertrand Songis
parent 7aca3eb5b7
commit 6898efcc02
16 changed files with 66 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

9
companion/src/generaledit/hardware.cpp
View file

@ -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);
}

105
companion/src/generaledit/hardware.ui
View file

@ -149,15 +149,6 @@
<property name="statusTip">
<string/>
</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>
</item>
<item row="13" column="2">
@ -168,15 +159,6 @@
<property name="statusTip">
<string/>
</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>
</item>
<item row="34" column="1">
@ -899,15 +881,6 @@
<property name="statusTip">
<string/>
</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>
</item>
<item row="10" column="2">
@ -918,15 +891,6 @@
<property name="statusTip">
<string/>
</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>
</item>
<item row="9" column="2">
@ -937,15 +901,6 @@
<property name="statusTip">
<string/>
</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>
</item>
<item row="8" column="2">
@ -956,15 +911,6 @@
<property name="statusTip">
<string/>
</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>
</item>
<item row="7" column="2">
@ -975,15 +921,6 @@
<property name="statusTip">
<string/>
</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>
</item>
<item row="6" column="2">
@ -994,15 +931,6 @@
<property name="statusTip">
<string/>
</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>
</item>
<item row="5" column="2">
@ -1013,15 +941,6 @@
<property name="statusTip">
<string/>
</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>
</item>
<item row="4" column="2">
@ -1032,15 +951,6 @@
<property name="statusTip">
<string/>
</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>
</item>
<item row="32" column="0">
@ -1103,21 +1013,6 @@
<property name="text" stdset="0">
<string/>
</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>
</item>
<item>

2
radio/src/bluetooth.cpp
View file

@ -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()

13
radio/src/gui/212x64/radio_hardware.cpp
View file

@ -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:

8
radio/src/opentx.h
View file

@ -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,

5
radio/src/translations/cz.h.txt
View file

@ -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:"

8
radio/src/translations/de.h.txt
View file

@ -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:"

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

@ -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:"

5
radio/src/translations/es.h.txt
View file

@ -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:"

5
radio/src/translations/fi.h.txt
View file

@ -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:"

4
radio/src/translations/fr.h.txt
View file

@ -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:"

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

@ -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.:"

5
radio/src/translations/nl.h.txt
View file

@ -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:"

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

@ -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ść:"

5
radio/src/translations/pt.h.txt
View file

@ -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"

5
radio/src/translations/se.h.txt
View file

@ -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:"