From 48b50167b2ac6c08e84650e431511f4c56bd8f4e Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Mon, 16 Dec 2019 14:22:23 +0100
Subject: [PATCH] Cosmetics

---
 radio/src/opentx.cpp      |  9 +++------
 radio/src/pulses/pulses.h | 10 ++++++++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 53f3718bf..43f1f9e5a 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -1557,12 +1557,8 @@ void doMixerCalculations()
 
 #if defined(PXX) || defined(DSM2)
     static uint8_t countRangecheck = 0;
-    for (uint8_t i=0; i<NUM_MODULES; ++i) {
-#if defined(MULTIMODULE)
-      if (moduleState[i].mode >= MODULE_MODE_BEEP_FIRST || getMultiModuleStatus(i).isBinding()) {
-#else
-      if (moduleState[i].mode >= MODULE_MODE_BEEP_FIRST) {
-#endif
+    for (uint8_t i = 0; i < NUM_MODULES; ++i) {
+      if (isModuleBeeping(i)) {
         if (++countRangecheck >= 250) {
           countRangecheck = 0;
           AUDIO_PLAY(AU_SPECIAL_SOUND_CHEEP);
@@ -1573,6 +1569,7 @@ void doMixerCalculations()
 
     checkTrims();
   }
+
   DEBUG_TIMER_STOP(debugTimerMixes10ms);
 
   s_mixer_first_run_done = true;
diff --git a/radio/src/pulses/pulses.h b/radio/src/pulses/pulses.h
index 6e7f0c8b6..01335fc0c 100644
--- a/radio/src/pulses/pulses.h
+++ b/radio/src/pulses/pulses.h
@@ -213,6 +213,16 @@ PACK(struct ModuleState {
 
 extern ModuleState moduleState[NUM_MODULES];
 
+inline bool isModuleBeeping(uint8_t moduleIndex)
+{
+#if defined(MULTIMODULE)
+  if (getMultiModuleStatus(moduleIndex).isBinding())
+    return true;
+#endif
+
+  return moduleState[moduleIndex].mode >= MODULE_MODE_BEEP_FIRST;
+}
+
 template<class T> struct PpmPulsesData {
   T pulses[20];
   T * ptr;