From 5a859136252476cd5a040f691e7faf259425a761 Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 16 Dec 2019 18:09:19 +0100 Subject: [PATCH] Continued --- radio/src/gui/colorlcd/model_setup.cpp | 2 ++ radio/src/pulses/pulses.h | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model_setup.cpp index e91111fef..1e73ba5cf 100644 --- a/radio/src/gui/colorlcd/model_setup.cpp +++ b/radio/src/gui/colorlcd/model_setup.cpp @@ -715,11 +715,13 @@ class ModuleWindow : public FormGroup { if (moduleState[moduleIdx].mode != MODULE_MODE_BIND) { bindButton->check(false); } +#if defined(MULTIMODULE) if (getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) { setMultiBindStatus(moduleIdx, MULTI_BIND_NONE); moduleState[moduleIdx].mode = MODULE_MODE_NORMAL; bindButton->check(false); } +#endif }); rangeButton = new TextButton(this, grid.getFieldSlot(2+thirdColumn, 1+thirdColumn), STR_MODULE_RANGE); diff --git a/radio/src/pulses/pulses.h b/radio/src/pulses/pulses.h index c0396bdf8..050393d88 100644 --- a/radio/src/pulses/pulses.h +++ b/radio/src/pulses/pulses.h @@ -216,9 +216,8 @@ extern ModuleState moduleState[NUM_MODULES]; inline bool isModuleBeeping(uint8_t moduleIndex) { #if defined(MULTIMODULE) -#if !defined(INTERNAL_MODULE_MULTI) - if (moduleIndex == INTERNAL_MODULE) - return false; + if (getMultiBindStatus(moduleIndex) != MULTI_BIND_NONE) + return true; #endif if (getMultiModuleStatus(moduleIndex).isBinding()) return true;