Buzzer Logic Improved

Chnaged the buzzer timings including and Added method to for non blocking execution using FreeRTOS

Co-Authored-By: Oneli Wijesuriya <247418039+onelicodes@users.noreply.github.com>

Author: heyisula

ESP32-S3-Main/src/actuators/sfm27.cpp

@@ -7,17 +7,39 @@ Buzzer::Buzzer() {
     buzzer1Pin = BUZZER_1;
     buzzer2Pin = BUZZER_2;
     volume = 100; // default max
+    patternActive = false;
+    currentStep = 0;
+    taskHandle = NULL;
+}
+
+void Buzzer::taskWorker(void* _this) {
+    Buzzer* buzzer = (Buzzer*)_this;
+    while (true) {
+        buzzer->process();
+        vTaskDelay(20 / portTICK_PERIOD_MS);
+    }
 }
 
 void Buzzer::begin() {
     pinMode(buzzer1Pin, OUTPUT);
     pinMode(buzzer2Pin, OUTPUT);
 
-    patternActive = false;
-    currentStep = 0;
-    nextStepTime = 0;
+    activeChannels = BUZZER_CH_BOTH;
 
     stop();
+
+    // Create FreeRTOS task for non-blocking execution
+    if (taskHandle == NULL) {
+        xTaskCreatePinnedToCore(
+            taskWorker,   // Function
+            "BuzzerTask", // Name
+            2048,         // Stack size
+            this,         // Param
+            1,            // Priority
+            &taskHandle,  // Handle
+            1             // Core (Application Core)
+        );
+    }
 }
 
 void Buzzer::setVolume(int vol) {
@@ -26,55 +48,84 @@ void Buzzer::setVolume(int vol) {
 
 void Buzzer::drive(uint16_t duration_ms, uint16_t freq) {
     if (volume == 0) {
-        stop();
+        digitalWrite(buzzer1Pin, LOW);
+        digitalWrite(buzzer2Pin, LOW);
         return;
     }
 
-    // Max loudness: Push-pull (one pin HIGH, one pin LOW)
-    digitalWrite(buzzer1Pin, HIGH);
-    digitalWrite(buzzer2Pin, LOW);
+    if (activeChannels & BUZZER_CH_1) {
+        digitalWrite(buzzer1Pin, HIGH);
+    } else {
+        digitalWrite(buzzer1Pin, LOW);
+    }
+    
+    if (activeChannels & BUZZER_CH_2) {
+        digitalWrite(buzzer2Pin, HIGH);
+    } else {
+        digitalWrite(buzzer2Pin, LOW);
+    }
 }
 
 void Buzzer::stop() {
+    patternActive = false;
+    
     digitalWrite(buzzer1Pin, LOW);
     digitalWrite(buzzer2Pin, LOW);
 }
 
-void Buzzer::playTone(BuzzerTone tone) {
-    patternActive = true;
-    patternStartTime = millis();
+void Buzzer::playTone(BuzzerTone tone, uint8_t channels) {
+    // Stop previous pattern
+    patternActive = false; 
+    delay(5); // Small delay to ensuring clean state
+    
     currentStep = 0;
+    activeChannels = channels;
 
     switch (tone) {
         case TONE_CONFIRM:   totalSteps = 1; break; // 1 beep
         case TONE_WARNING:   totalSteps = 3; break; // Beep, Sil, Beep
         case TONE_ERROR:     totalSteps = 5; break; // Beep, Sil, Beep, Sil, Beep
         case TONE_EMERGENCY: totalSteps = 19; break; // Rapid pulses
     }
+    
+    patternStartTime = millis();
     nextStepTime = millis();
+    patternActive = true;
 }
 
-void Buzzer::update() {
+
+void Buzzer::process() {
     if (!patternActive) return;
 
     if (millis() >= nextStepTime) {
+        // Check if we have completed all steps
+        if (currentStep >= totalSteps) {
+            stop();
+            return;
+        }
+
         // Step logic: Even steps are ON, Odd steps are OFF
         if (currentStep % 2 == 0) {
             drive(0, 0); // Sound ON
-            nextStepTime = millis() + 150; // Duration 150ms
+            nextStepTime = millis() + 400; // Duration 400ms
         } else {
-            stop(); // Sound OFF
-            nextStepTime = millis() + 100; // Gap 100ms
+            // Turn off sound but keep pattern active
+            digitalWrite(buzzer1Pin, LOW);
+            digitalWrite(buzzer2Pin, LOW);
+            
+            nextStepTime = millis() + 200; // Gap 200ms
         }
 
         currentStep++;
-        if (currentStep >= totalSteps) {
-            stop();
-            patternActive = false;
-        }
     }
 }
 
+
+// Kept empty to prevent breaking existing code calls.
+void Buzzer::update() {
+    // Logic moved to process() called by taskWorker
+}
+
 void Buzzer::controlFromFirebase(bool buzzer01ring, bool buzzer02ring, int buzzersound) {
     if (buzzersound != lastVolume) {
         lastVolume = buzzersound;
@@ -85,22 +136,35 @@ void Buzzer::controlFromFirebase(bool buzzer01ring, bool buzzer02ring, int buzze
         Serial.println("%");
     }
 
+    // Handle Buzzer 1 Request (Warning Tone)
     if (buzzer01ring) {
         if (!buzzer1Active) {
             buzzer1Active = true;
-            playTone(TONE_CONFIRM);
+            playTone(TONE_WARNING, BUZZER_CH_1);
         }
     } else {
-        buzzer1Active = false;
+        if (buzzer1Active) {
+            buzzer1Active = false;
+            // Only stop if this was the active channel
+            if (patternActive && (activeChannels == BUZZER_CH_1)) {
+                stop();
+            }
+        }
     }
 
+    // Handle Buzzer 2 Request (Emergency Tone)
     if (buzzer02ring) {
         if (!buzzer2Active) {
             buzzer2Active = true;
-            playTone(TONE_EMERGENCY);
+            playTone(TONE_EMERGENCY, BUZZER_CH_2);
         }
     } else {
-        buzzer2Active = false;
+        if (buzzer2Active) {
+            buzzer2Active = false;
+            if (patternActive && (activeChannels == BUZZER_CH_2)) {
+                stop();
+            }
+        }
     }
 }
 
@@ -109,17 +173,21 @@ void Buzzer::singleBeep() {
 }
 
 void Buzzer::doubleBeep() {
-    patternActive = true;
-    patternStartTime = millis();
+    patternActive = false;
     currentStep = 0;
-    totalSteps = 3; // On, Off, On
+    activeChannels = BUZZER_CH_BOTH;
+    totalSteps = 3; 
     nextStepTime = millis();
+    patternStartTime = millis();
+    patternActive = true;
 }
 
 void Buzzer::tripleBeep() {
-    patternActive = true;
-    patternStartTime = millis();
+    patternActive = false;
     currentStep = 0;
-    totalSteps = 5; // On, Off, On, Off, On
+    activeChannels = BUZZER_CH_BOTH;
+    totalSteps = 5;
     nextStepTime = millis();
+    patternStartTime = millis();
+    patternActive = true;
 }

ESP32-S3-Main/src/actuators/sfm27.h

@@ -10,11 +10,18 @@ enum BuzzerTone {
     TONE_EMERGENCY
 };
 
+enum BuzzerChannel {
+    BUZZER_CH_1 = 1,
+    BUZZER_CH_2 = 2,
+    BUZZER_CH_BOTH = 3
+};
+
 class Buzzer {
 private:
     uint8_t buzzer1Pin;
     uint8_t buzzer2Pin;
     uint8_t volume; // 0-100
+    uint8_t activeChannels;
 
     void drive(uint16_t cycles, uint16_t freq);
 
@@ -27,14 +34,14 @@ class Buzzer {
     Buzzer();
     void begin();
     void setVolume(int vol);
-    void playTone(BuzzerTone tone);
+    void playTone(BuzzerTone tone, uint8_t channels = BUZZER_CH_BOTH);
 
     void singleBeep();
     void doubleBeep();
     void tripleBeep();
     void emergencyAlarm();
     void stop();
-    void update(); // Must be called in main loop
+    void update(); 
 
     void controlFromFirebase(bool buzzer01ring, bool buzzer02ring, int buzzersound);
 
@@ -44,9 +51,11 @@ class Buzzer {
     int currentStep;
     int totalSteps;
     bool patternActive;
-    
-    // Pattern definitions
     void startPattern(int type);
+    
+    TaskHandle_t taskHandle;
+    static void taskWorker(void* _this);
+    void process();
 };
 
 #endif