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

Bugfixes on X3 and X7

Browse Source
This commit is contained in:
Bertrand Songis
2019-04-28 21:19:17 +02:00
parent abb2c063db
commit a84a50f8a6
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/model_setup.cpp
+5 -9
View File
@@ -111,9 +111,6 @@ enum MenuModelSetupItems {
ITEM_MODEL_EXTERNAL_MODULE_AUTOBIND, ITEM_MODEL_EXTERNAL_MODULE_AUTOBIND,
#endif #endif
ITEM_MODEL_EXTERNAL_MODULE_POWER, ITEM_MODEL_EXTERNAL_MODULE_POWER,
#if !defined(PCBXLITE)
ITEM_MODEL_EXTERNAL_MODULE_FREQ,
#endif
ITEM_MODEL_EXTERNAL_MODULE_FAILSAFE, ITEM_MODEL_EXTERNAL_MODULE_FAILSAFE,
ITEM_MODEL_EXTERNAL_MODULE_PXX2_REGISTER_RANGE, ITEM_MODEL_EXTERNAL_MODULE_PXX2_REGISTER_RANGE,
ITEM_MODEL_EXTERNAL_MODULE_PXX2_OPTIONS, ITEM_MODEL_EXTERNAL_MODULE_PXX2_OPTIONS,
@@ -125,17 +122,17 @@ enum MenuModelSetupItems {
ITEM_MODEL_EXTRA_MODULE_CHANNELS, ITEM_MODEL_EXTRA_MODULE_CHANNELS,
ITEM_MODEL_EXTRA_MODULE_BIND, ITEM_MODEL_EXTRA_MODULE_BIND,
#endif #endif
#if defined(PCBX7) || defined(PCBX3) #if defined(PCBTARANIS)
ITEM_MODEL_TRAINER_LABEL, ITEM_MODEL_TRAINER_LABEL,
ITEM_MODEL_TRAINER_MODE, ITEM_MODEL_TRAINER_MODE,
#endif
#if defined(PCBX7) || defined(PCBX3)
#if defined(BLUETOOTH) #if defined(BLUETOOTH)
ITEM_MODEL_TRAINER_BLUETOOTH, ITEM_MODEL_TRAINER_BLUETOOTH,
#endif #endif
ITEM_MODEL_TRAINER_CHANNELS, ITEM_MODEL_TRAINER_CHANNELS,
ITEM_MODEL_TRAINER_PARAMS, ITEM_MODEL_TRAINER_PARAMS,
#elif defined(PCBXLITE) #elif defined(PCBXLITE)
ITEM_MODEL_TRAINER_LABEL,
ITEM_MODEL_TRAINER_MODE,
ITEM_MODEL_TRAINER_BLUETOOTH, ITEM_MODEL_TRAINER_BLUETOOTH,
ITEM_MODEL_TRAINER_CHANNELS, ITEM_MODEL_TRAINER_CHANNELS,
ITEM_MODEL_TRAINER_PARAMS, ITEM_MODEL_TRAINER_PARAMS,
@@ -179,7 +176,7 @@ enum MenuModelSetupItems {
#if defined(PCBSKY9X) && defined(REVX) #if defined(PCBSKY9X) && defined(REVX)
#define OUTPUT_TYPE_ROWS() (isModulePPM(EXTERNAL_MODULE) ? (uint8_t)0 : HIDDEN_ROW) , #define OUTPUT_TYPE_ROWS() (isModulePPM(EXTERNAL_MODULE) ? (uint8_t)0 : HIDDEN_ROW) ,
#else #elif defined(PCBSKY9X)
#define OUTPUT_TYPE_ROWS() #define OUTPUT_TYPE_ROWS()
#endif #endif
@@ -578,8 +575,7 @@ void menuModelSetup(event_t event)
MULTIMODULE_STATUS_ROWS MULTIMODULE_STATUS_ROWS
EXTERNAL_MODULE_CHANNELS_ROWS, EXTERNAL_MODULE_CHANNELS_ROWS,
IF_NOT_PXX2_MODULE(EXTERNAL_MODULE, EXTERNAL_MODULE_BIND_ROWS()), // line reused for PPM: PPM settings IF_NOT_PXX2_MODULE(EXTERNAL_MODULE, EXTERNAL_MODULE_BIND_ROWS()), // line reused for PPM: PPM settings
IF_PXX2_MODULE(EXTERNAL_MODULE, 0), // RxNum IF_PXX2_MODULE(EXTERNAL_MODULE, 0), // RxNum
OUTPUT_TYPE_ROWS()
IF_NOT_PXX2_MODULE(EXTERNAL_MODULE, EXTERNAL_MODULE_OPTION_ROW), IF_NOT_PXX2_MODULE(EXTERNAL_MODULE, EXTERNAL_MODULE_OPTION_ROW),
MULTIMODULE_MODULE_ROWS MULTIMODULE_MODULE_ROWS
EXTERNAL_MODULE_POWER_ROW, EXTERNAL_MODULE_POWER_ROW,