Added Different noises for GPS enable and GPS disable

One beep for GPS enable and the same beep for disable made it impossible to know which is which so now it has distinct different sounds.
meshtastic · Oct 18, 2024 · 4b872f1 · 4b872f1
1 parent 026bb74
commit 4b872f1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/src/ButtonThread.cpp b/src/ButtonThread.cpp
@@ -169,10 +169,8 @@ int32_t ButtonThread::runOnce()
             case 3:
                 if (!config.device.disable_triple_click && (gps != nullptr)) {
                     gps->toggleGpsMode();
-                    if (screen) {
+                    if (screen)
                         screen->forceDisplay(true); // Force a new UI frame, then force an EInk update
-                    }
-                    playBeep();
                 }
                 break;
 #endif

diff --git a/src/buzz/buzz.cpp b/src/buzz/buzz.cpp
@@ -55,6 +55,18 @@ void playBeep()
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
 
+void playGPSEnableBeep()
+{
+    ToneDuration melody[] = {{NOTE_CS4, DURATION_1_8}, {NOTE_FS3, DURATION_1_4}, {NOTE_C3, DURATION_1_4}};
+    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
+}
+
+void playGPSDisableBeep()
+{
+    ToneDuration melody[] = {{NOTE_C3, DURATION_1_8}, {NOTE_FS3, DURATION_1_4}, {NOTE_CS4, DURATION_1_4}};
+    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
+}
+
 void playStartMelody()
 {
     ToneDuration melody[] = {{NOTE_FS3, DURATION_1_8}, {NOTE_AS3, DURATION_1_8}, {NOTE_CS4, DURATION_1_4}};

diff --git a/src/buzz/buzz.h b/src/buzz/buzz.h
@@ -3,3 +3,5 @@
 void playBeep();
 void playStartMelody();
 void playShutdownMelody();
+void playGPSEnableBeep();
+void playGPSDisableBeep();
diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp
@@ -8,6 +8,7 @@
 #include "RTC.h"
 #include "Throttle.h"
 #include "meshUtils.h"
+#include "buzz.h"
 
 #include "main.h" // pmu_found
 #include "sleep.h"
@@ -1680,6 +1681,7 @@ void GPS::toggleGpsMode()
     if (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED) {
         config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_DISABLED;
         LOG_INFO("User toggled GpsMode. Now DISABLED.");
+        playGPSDisableBeep();
 #ifdef GNSS_AIROHA
         if (powerState == GPS_ACTIVE) {
             LOG_DEBUG("User power Off GPS");
@@ -1690,6 +1692,7 @@ void GPS::toggleGpsMode()
     } else if (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_DISABLED) {
         config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_ENABLED;
         LOG_INFO("User toggled GpsMode. Now ENABLED");
+        playGPSEnableBeep();
         enable();
     }
 }