From 73562b12f134df25f14d40bc82ec124db020762c Mon Sep 17 00:00:00 2001 From: 3djc Date: Thu, 16 Aug 2018 10:58:33 +0200 Subject: [PATCH] Fix xlites trainer menu --- radio/src/dataconstants.h | 4 +++- radio/src/gui/128x64/model_setup.cpp | 12 +++++++++--- radio/src/gui/gui_common_arm.cpp | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index 8b168b7ff..fc4423444 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -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 diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 6b2298f09..20dcc8e21 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -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; diff --git a/radio/src/gui/gui_common_arm.cpp b/radio/src/gui/gui_common_arm.cpp index 2b22783e0..4768e0aa2 100644 --- a/radio/src/gui/gui_common_arm.cpp +++ b/radio/src/gui/gui_common_arm.cpp @@ -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))