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

Fix xlites trainer menu

Browse source
This commit is contained in:
3djc 2018-08-16 10:58:33 +02: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

4
radio/src/dataconstants.h
View file

@ -215,7 +215,9 @@ enum BeeperMode {
}; };
#endif #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 #define TRAINER_MODE_MAX() TRAINER_MODE_SLAVE_BLUETOOTH
#elif defined(PCBX7) || defined(PCBXLITE) #elif defined(PCBX7) || defined(PCBXLITE)
#define TRAINER_MODE_MAX() TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE #define TRAINER_MODE_MAX() TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE

12
radio/src/gui/128x64/model_setup.cpp
View file

@ -76,7 +76,7 @@ enum MenuModelSetupItems {
ITEM_MODEL_INTERNAL_MODULE_CHANNELS, ITEM_MODEL_INTERNAL_MODULE_CHANNELS,
ITEM_MODEL_INTERNAL_MODULE_BIND, ITEM_MODEL_INTERNAL_MODULE_BIND,
ITEM_MODEL_INTERNAL_MODULE_FAILSAFE, ITEM_MODEL_INTERNAL_MODULE_FAILSAFE,
#if defined(PCBXLITE) #if defined(PCBXLITE) || defined(PCBXLITES)
ITEM_MODEL_INTERNAL_MODULE_ANTENNA, ITEM_MODEL_INTERNAL_MODULE_ANTENNA,
#endif #endif
#endif #endif
@ -111,7 +111,7 @@ enum MenuModelSetupItems {
#endif #endif
ITEM_MODEL_TRAINER_CHANNELS, ITEM_MODEL_TRAINER_CHANNELS,
ITEM_MODEL_TRAINER_PARAMS, ITEM_MODEL_TRAINER_PARAMS,
#elif defined(PCBXLITE) #elif defined(PCBXLITE) || defined(PCBXLITES)
ITEM_MODEL_TRAINER_LABEL, ITEM_MODEL_TRAINER_LABEL,
ITEM_MODEL_TRAINER_MODE, ITEM_MODEL_TRAINER_MODE,
ITEM_MODEL_TRAINER_BLUETOOTH, ITEM_MODEL_TRAINER_BLUETOOTH,
@ -185,6 +185,12 @@ enum MenuModelSetupItems {
#define TRAINER_CHANNELS_ROW (IS_SLAVE_TRAINER() ? (uint8_t)1 : HIDDEN_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_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 #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) #elif defined(PCBXLITE)
#define ANTENNA_ROW IF_INTERNAL_MODULE_ON(0), #define ANTENNA_ROW IF_INTERNAL_MODULE_ON(0),
#define IF_BT_TRAINER_ON(x) (g_eeGeneral.bluetoothMode == BLUETOOTH_TRAINER ? (uint8_t)(x) : HIDDEN_ROW) #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) void menuModelSetup(event_t event)
{ {
#if defined(PCBXLITE) #if defined(PCBXLITE) || defined(PCBXLITES)
// Switch to external antenna confirmation // Switch to external antenna confirmation
if (warningResult) { if (warningResult) {
warningResult = 0; warningResult = 0;

2
radio/src/gui/gui_common_arm.cpp
View file

@ -588,7 +588,7 @@ bool isTrainerModeAvailable(int mode)
else else
return true; return true;
} }
#elif defined(PCBX7) #elif defined(PCBX7) || defined(PCBXLITES)
bool isTrainerModeAvailable(int mode) bool isTrainerModeAvailable(int mode)
{ {
if (IS_EXTERNAL_MODULE_ENABLED() && (mode == TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE || mode == TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE)) if (IS_EXTERNAL_MODULE_ENABLED() && (mode == TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE || mode == TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE))