From 788119a0936055586032f4bc8276767f1b26c5e6 Mon Sep 17 00:00:00 2001
From: mikeller <github@ike.ch>
Date: Thu, 18 Oct 2018 02:08:05 +1300
Subject: [PATCH 1/2] Changed visual beeper to respect beeper settings.

---
 src/main/io/beeper.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/io/beeper.c b/src/main/io/beeper.c
index 0c4d04c0a..73c3a20b1 100644
--- a/src/main/io/beeper.c
+++ b/src/main/io/beeper.c
@@ -178,7 +178,7 @@ static uint8_t beep_multiBeeps[MAX_MULTI_BEEPS + 1];
 #define BEEPER_WARNING_BEEP_GAP_DURATION 10
 
 // Beeper off = 0 Beeper on = 1
-static uint8_t beeperIsOn = 0;
+static bool beeperIsOn = false;
 
 // Place in current sequence
 static uint16_t beeperPos = 0;
@@ -283,12 +283,11 @@ void beeper(beeperMode_e mode)
 void beeperSilence(void)
 {
     BEEP_OFF;
+    beeperIsOn = false;
+
     warningLedDisable();
     warningLedRefresh();
 
-
-    beeperIsOn = 0;
-
     beeperNextToggleTime = 0;
     beeperPos = 0;
 
@@ -399,8 +398,6 @@ void beeperUpdate(timeUs_t currentTimeUs)
     }
 
     if (!beeperIsOn) {
-        beeperIsOn = 1;
-
 #ifdef USE_DSHOT
         if (!areMotorsRunning()
             && ((currentBeeperEntry->mode == BEEPER_RX_SET && !(beeperConfig()->dshotBeaconOffFlags & BEEPER_GET_FLAG(BEEPER_RX_SET)))
@@ -414,8 +411,11 @@ void beeperUpdate(timeUs_t currentTimeUs)
 #endif
 
         if (currentBeeperEntry->sequence[beeperPos] != 0) {
-            if (!(beeperConfigMutable()->beeper_off_flags & BEEPER_GET_FLAG(currentBeeperEntry->mode)))
+            if (!(beeperConfigMutable()->beeper_off_flags & BEEPER_GET_FLAG(currentBeeperEntry->mode))) {
                 BEEP_ON;
+                beeperIsOn = true;
+            }
+
             warningLedEnable();
             warningLedRefresh();
             // if this was arming beep then mark time (for blackbox)
@@ -427,9 +427,10 @@ void beeperUpdate(timeUs_t currentTimeUs)
             }
         }
     } else {
-        beeperIsOn = 0;
         if (currentBeeperEntry->sequence[beeperPos] != 0) {
             BEEP_OFF;
+            beeperIsOn = false;
+
             warningLedDisable();
             warningLedRefresh();
         }

From a4b2f655d445f62eacdd098f2078b7a4e5b43cf7 Mon Sep 17 00:00:00 2001
From: mikeller <github@ike.ch>
Date: Thu, 18 Oct 2018 19:09:01 +1300
Subject: [PATCH 2/2] Fix from review.

---
 src/main/io/beeper.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/io/beeper.c b/src/main/io/beeper.c
index 73c3a20b1..3007c093a 100644
--- a/src/main/io/beeper.c
+++ b/src/main/io/beeper.c
@@ -177,7 +177,6 @@ static uint8_t beep_multiBeeps[MAX_MULTI_BEEPS + 1];
 #define BEEPER_WARNING_BEEP_2_DURATION 5
 #define BEEPER_WARNING_BEEP_GAP_DURATION 10
 
-// Beeper off = 0 Beeper on = 1
 static bool beeperIsOn = false;
 
 // Place in current sequence