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

Fix xlites trainer menu

Browse Source
This commit is contained in:
3djc
2018-11-03 16:56:51 +01:00
committed by Bertrand Songis
parent 7987042a1b
commit 73562b12f1
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/dataconstants.h
+3 -1
View File
@@ -215,7 +215,9 @@ enum BeeperMode {
};
#endif
#if defined(BLUETOOTH)
#if defined(PCBXLITES)
#define TRAINER_MODE_MAX() TRAINER_MODE_SLAVE
#elif defined(BLUETOOTH)
#define TRAINER_MODE_MAX() TRAINER_MODE_SLAVE_BLUETOOTH
#elif defined(PCBX7) || defined(PCBXLITE)
#define TRAINER_MODE_MAX() TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE
radio/src/gui/128x64/model_setup.cpp
+9 -3
View File
@@ -76,7 +76,7 @@ enum MenuModelSetupItems {
ITEM_MODEL_INTERNAL_MODULE_CHANNELS,
ITEM_MODEL_INTERNAL_MODULE_BIND,
ITEM_MODEL_INTERNAL_MODULE_FAILSAFE,
#if defined(PCBXLITE)
#if defined(PCBXLITE) || defined(PCBXLITES)
ITEM_MODEL_INTERNAL_MODULE_ANTENNA,
#endif
#endif
@@ -111,7 +111,7 @@ enum MenuModelSetupItems {
#endif
ITEM_MODEL_TRAINER_CHANNELS,
ITEM_MODEL_TRAINER_PARAMS,
#elif defined(PCBXLITE)
#elif defined(PCBXLITE) || defined(PCBXLITES)
ITEM_MODEL_TRAINER_LABEL,
ITEM_MODEL_TRAINER_MODE,
ITEM_MODEL_TRAINER_BLUETOOTH,
@@ -185,6 +185,12 @@ enum MenuModelSetupItems {
#define TRAINER_CHANNELS_ROW (IS_SLAVE_TRAINER() ? (uint8_t)1 : HIDDEN_ROW)
#define TRAINER_PARAMS_ROW (IS_SLAVE_TRAINER() ? (uint8_t)2 : HIDDEN_ROW)
#define TRAINER_ROWS LABEL(Trainer), 0, TRAINER_BLUETOOTH_ROW TRAINER_CHANNELS_ROW, TRAINER_PARAMS_ROW
#elif defined(PCBXLITES)
#define ANTENNA_ROW IF_INTERNAL_MODULE_ON(0),
#define TRAINER_BLUETOOTH_ROW
#define TRAINER_CHANNELS_ROW (IS_SLAVE_TRAINER() ? (uint8_t)1 : HIDDEN_ROW)
#define TRAINER_PARAMS_ROW (IS_SLAVE_TRAINER() ? (uint8_t)2 : HIDDEN_ROW)
#define TRAINER_ROWS LABEL(Trainer), 0, TRAINER_CHANNELS_ROW, TRAINER_PARAMS_ROW
#elif defined(PCBXLITE)
#define ANTENNA_ROW IF_INTERNAL_MODULE_ON(0),
#define IF_BT_TRAINER_ON(x) (g_eeGeneral.bluetoothMode == BLUETOOTH_TRAINER ? (uint8_t)(x) : HIDDEN_ROW)
@@ -228,7 +234,7 @@ void onBindMenu(const char * result)
void menuModelSetup(event_t event)
{
#if defined(PCBXLITE)
#if defined(PCBXLITE) || defined(PCBXLITES)
// Switch to external antenna confirmation
if (warningResult) {
warningResult = 0;
radio/src/gui/gui_common_arm.cpp
+1 -1
View File
@@ -588,7 +588,7 @@ bool isTrainerModeAvailable(int mode)
else
return true;
}
#elif defined(PCBX7)
#elif defined(PCBX7) || defined(PCBXLITES)
bool isTrainerModeAvailable(int mode)
{
if (IS_EXTERNAL_MODULE_ENABLED() && (mode == TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE || mode == TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE))