From c12eb34691c7953663a9f73b71772854c2fed987 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 9 Feb 2019 09:41:26 +0100 Subject: [PATCH] Add PXX2 channel range --- radio/src/gui/128x64/model_setup.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index e83cfa3bc..1ea7f2c5b 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -81,6 +81,7 @@ enum MenuModelSetupItems { ITEM_MODEL_INTERNAL_MODULE_ANTENNA, #endif ITEM_MODEL_INTERNAL_MODULE_FAILSAFE, + ITEM_MODEL_INTERNAL_MODULE_CH_RANGE, ITEM_MODEL_INTERNAL_MODULE_PXX2_RANGE_REGISTER, ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_1_NUMBER, ITEM_MODEL_INTERNAL_MODULE_PXX2_RECEIVER_1_RANGE, @@ -311,7 +312,8 @@ void menuModelSetup(event_t event) IF_PXX2(0), // Model Number ANTENNA_ROW IF_INTERNAL_MODULE_ON(FAILSAFE_ROWS(INTERNAL_MODULE)), - IF_PXX2_RECEIVER_DISPLAYED(INTERNAL_MODULE, 0, 1), // Range check and Register buttons + IF_INTERNAL_MODULE_ON(0), // Module start channel + IF_PXX2_RECEIVER_DISPLAYED(INTERNAL_MODULE, 0, 1), // Range check and Register buttons IF_PXX2_RECEIVER_DISPLAYED(INTERNAL_MODULE, 0, (uint8_t)-1), // Receiver Number IF_PXX2_RECEIVER_DISPLAYED(INTERNAL_MODULE, 0, 0), // Receiver Range IF_PXX2_RECEIVER_DISPLAYED(INTERNAL_MODULE, 0, 0), // Receiver Telemetry @@ -1055,6 +1057,20 @@ void menuModelSetup(event_t event) break; + case ITEM_MODEL_INTERNAL_MODULE_CH_RANGE: + { + uint8_t moduleIdx = CURRENT_MODULE_EDITED(k); + lcdDrawTextAlignedLeft(y, STR_CHANNELRANGE); + lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, "CH", attr); + lcdDrawNumber(lcdLastRightPos, y, g_model.moduleData[moduleIdx].channelsStart+1, attr); + lcdDrawText(lcdLastRightPos, y, "-"); + lcdDrawNumber(lcdLastRightPos, y, g_model.moduleData[moduleIdx].channelsStart+16, 0); + if (attr) { + CHECK_INCDEC_MODELVAR_ZERO(event, g_model.moduleData[moduleIdx].channelsStart, 16); //TODO this needs discussion + } + } + break; + case ITEM_MODEL_INTERNAL_MODULE_PXX2_MODEL_NUM: lcdDrawTextAlignedLeft(y, STR_RECEIVER_NUM); lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[INTERNAL_MODULE], attr | LEADING0|LEFT, 2);