From 77ef237f0aa47388f9e582d0ac564b540d1261e9 Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 4 Nov 2019 11:12:57 +0100 Subject: [PATCH] Only change R9M chancount when exceeds max allowed (#7021) This fixes #6983 --- radio/src/gui/128x64/model_setup.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 00cc5d85b..f0e8f9bce 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -1499,7 +1499,7 @@ void menuModelSetup(event_t event) lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_FCC_POWER_VALUES, module.pxx.power, LEFT | attr); if (attr) { CHECK_INCDEC_MODELVAR_ZERO(event, module.pxx.power, R9M_FCC_POWER_MAX); - if (s_editMode == 0 && reusableBuffer.moduleSetup.r9mPower != module.pxx.power) { + if (s_editMode == 0 && reusableBuffer.moduleSetup.r9mPower != module.pxx.power && module.channelsCount > maxModuleChannels_M8(moduleIdx)) { module.channelsStart = 0; module.channelsCount = maxModuleChannels_M8(moduleIdx); } @@ -1516,7 +1516,8 @@ void menuModelSetup(event_t event) CHECK_INCDEC_MODELVAR_ZERO(event, module.pxx.power, R9M_LITE_LBT_POWER_MAX); if (s_editMode == 0 && reusableBuffer.moduleSetup.r9mPower != module.pxx.power) { module.channelsStart = 0; - module.channelsCount = maxModuleChannels_M8(moduleIdx); + if (module.channelsCount > maxModuleChannels_M8(moduleIdx)) + module.channelsCount = maxModuleChannels_M8(moduleIdx); if (reusableBuffer.moduleSetup.r9mPower + module.pxx.power < 5) { // switching between mode 2 and 3 does not require rebind POPUP_WARNING(STR_REBIND); } @@ -1532,7 +1533,8 @@ void menuModelSetup(event_t event) CHECK_INCDEC_MODELVAR_ZERO(event, module.pxx.power, R9M_LBT_POWER_MAX); if (s_editMode == 0 && reusableBuffer.moduleSetup.r9mPower != module.pxx.power) { module.channelsStart = 0; - module.channelsCount = maxModuleChannels_M8(moduleIdx); + if (module.channelsCount > maxModuleChannels_M8(moduleIdx)) + module.channelsCount = maxModuleChannels_M8(moduleIdx); if (reusableBuffer.moduleSetup.r9mPower + module.pxx.power < 5) { //switching between mode 2 and 3 does not require rebind POPUP_WARNING(STR_REBIND); }