From 5aae25284bbc7a40198afeca8e2d9729d4b9f40d Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 9 Feb 2019 11:37:11 +0100 Subject: [PATCH] Use constant --- radio/src/gui/128x64/model_setup.cpp | 4 ++-- radio/src/pulses/modules.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 1ea7f2c5b..8c207efc2 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -1064,9 +1064,9 @@ void menuModelSetup(event_t event) 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); + lcdDrawNumber(lcdLastRightPos, y, g_model.moduleData[moduleIdx].channelsStart+PXX2_MODULE_CHANNELS, 0); if (attr) { - CHECK_INCDEC_MODELVAR_ZERO(event, g_model.moduleData[moduleIdx].channelsStart, 16); //TODO this needs discussion + CHECK_INCDEC_MODELVAR_ZERO(event, g_model.moduleData[moduleIdx].channelsStart, PXX2_MODULE_CHANNELS); //TODO this needs discussion } } break; diff --git a/radio/src/pulses/modules.h b/radio/src/pulses/modules.h index 5325100e5..80ae60e55 100644 --- a/radio/src/pulses/modules.h +++ b/radio/src/pulses/modules.h @@ -193,6 +193,7 @@ static const int8_t maxChannelsXJT[] = { 0, 8, 0, 4 }; // relative to 8! constexpr int8_t MAX_TRAINER_CHANNELS_M8 = MAX_TRAINER_CHANNELS - 8; constexpr int8_t MAX_EXTRA_MODULE_CHANNELS_M8 = 8; // only 16ch PPM +constexpr int8_t PXX2_MODULE_CHANNELS=16; inline int8_t maxModuleChannels_M8(uint8_t idx) {