Refactor buzzer logic and improve logging

Reworked buzzer state management for independent control of two buzzers, replaced verbose logging with concise messages to reduce loop lag, and improved Firebase initialization feedback. Updated main loop to conditionally run AutoLighting only when manual override is off, and added concise telemetry logging. Also switched Firebase library include to Firebase_ESP_Client.

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

Author: heyisula

ESP32-S3-Main/platformio.ini

@@ -26,9 +26,12 @@ lib_deps =
 	electroniccats/MPU6050@^1.4.4
 	teckel12/NewPing@^1.9.7
 	denyssene/SimpleKalmanFilter@^0.1.0
+build_type = debug
 build_flags = 
 	-DARDUINO_USB_MODE=0
 	-DARDUINO_USB_CDC_ON_BOOT=0
+	-DCORE_DEBUG_LEVEL=3
 monitor_filters = 
 	esp32_exception_decoder
 	time
+	colorize

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

@@ -58,21 +58,6 @@ void LEDArray::controlFromFirebase(int lightadj_left, int lightadj_right) {
     analogWrite(leftPin, leftPWM);
     analogWrite(rightPin, rightPWM);
 
-    // Log brightness changes
-    Serial.println("┌─────────────────────────");
-    Serial.print("│ LED Brightness Control:");
-    Serial.println();
-    Serial.print("│   Left:  ");
-    Serial.print(lightadj_left);
-    Serial.print("% (PWM: ");
-    Serial.print(leftPWM);
-    Serial.print(") ");
-    Serial.println(leftPWM == 0 ? "OFF" : "ON");
-    Serial.print("│   Right: ");
-    Serial.print(lightadj_right);
-    Serial.print("% (PWM: ");
-    Serial.print(rightPWM);
-    Serial.print(") ");
-    Serial.println(rightPWM == 0 ? "OFF" : "ON");
-    Serial.println("└─────────────────────────");
+    // Concise one-line log to avoid loop lag
+    Serial.printf("LEDs: L:%d%% R:%d%%\n", lightadj_left, lightadj_right);
 }

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

@@ -13,9 +13,10 @@ void Buzzer::begin() {
     pinMode(buzzer1Pin, OUTPUT);
     pinMode(buzzer2Pin, OUTPUT);
 
-    patternActive = false;
-    currentStep = 0;
-    nextStepTime = 0;
+    buzzer1PatternActive = false;
+    buzzer2PatternActive = false;
+    lastBuzzer1Ring = false;
+    lastBuzzer2Ring = false;
 
     stop();
 }
@@ -24,15 +25,21 @@ void Buzzer::setVolume(int vol) {
     volume = constrain(vol, 0, 100);
 }
 
-void Buzzer::drive(uint16_t duration_ms, uint16_t freq) {
+void Buzzer::drive(uint16_t buzzerNum, uint16_t freq) {
     if (volume == 0) {
         stop();
         return;
     }
 
-    // Max loudness: Push-pull (one pin HIGH, one pin LOW)
-    digitalWrite(buzzer1Pin, HIGH);
-    digitalWrite(buzzer2Pin, LOW);
+    // Drive pins independently
+    if (buzzerNum == 1) {
+        digitalWrite(buzzer1Pin, HIGH);
+        Serial.println(" -> B1 HIGH");
+    }
+    else if (buzzerNum == 2) {
+        digitalWrite(buzzer2Pin, HIGH);
+        Serial.println(" -> B2 HIGH");
+    }
 }
 
 void Buzzer::stop() {
@@ -41,36 +48,63 @@ void Buzzer::stop() {
 }
 
 void Buzzer::playTone(BuzzerTone tone) {
-    patternActive = true;
-    patternStartTime = millis();
-    currentStep = 0;
-    
+    startPattern(1, tone);
+}
+
+void Buzzer::startPattern(int buzzerNum, BuzzerTone tone) {
+    int steps = 1;
     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
+        case TONE_CONFIRM:   steps = 1; break;
+        case TONE_WARNING:   steps = 3; break;
+        case TONE_ERROR:     steps = 5; break;
+        case TONE_EMERGENCY: steps = 19; break;
+    }
+
+    if (buzzerNum == 1) {
+        Serial.println(" -> B1 Pattern Start");
+        buzzer1PatternActive = true;
+        buzzer1Step = 0;
+        buzzer1TotalSteps = steps;
+        buzzer1NextStepTime = millis();
+    } else {
+        Serial.println(" -> B2 Pattern Start");
+        buzzer2PatternActive = true;
+        buzzer2Step = 0;
+        buzzer2TotalSteps = steps;
+        buzzer2NextStepTime = millis();
     }
-    nextStepTime = millis();
 }
 
 void Buzzer::update() {
-    if (!patternActive) return;
-
-    if (millis() >= nextStepTime) {
-        // Step logic: Even steps are ON, Odd steps are OFF
-        if (currentStep % 2 == 0) {
-            drive(0, 0); // Sound ON
-            nextStepTime = millis() + 150; // Duration 150ms
+    // Update Buzzer 1
+    if (buzzer1PatternActive && millis() >= buzzer1NextStepTime) {
+        if (buzzer1Step % 2 == 0) {
+            drive(1, 0);
+            buzzer1NextStepTime = millis() + 150;
         } else {
-            stop(); // Sound OFF
-            nextStepTime = millis() + 100; // Gap 100ms
+            digitalWrite(buzzer1Pin, LOW);
+            buzzer1NextStepTime = millis() + 100;
+        }
+        buzzer1Step++;
+        if (buzzer1Step >= buzzer1TotalSteps) {
+            digitalWrite(buzzer1Pin, LOW);
+            buzzer1PatternActive = false;
         }
+    }
 
-        currentStep++;
-        if (currentStep >= totalSteps) {
-            stop();
-            patternActive = false;
+    // Update Buzzer 2
+    if (buzzer2PatternActive && millis() >= buzzer2NextStepTime) {
+        if (buzzer2Step % 2 == 0) {
+            drive(2, 0);
+            buzzer2NextStepTime = millis() + 150;
+        } else {
+            digitalWrite(buzzer2Pin, LOW);
+            buzzer2NextStepTime = millis() + 100;
+        }
+        buzzer2Step++;
+        if (buzzer2Step >= buzzer2TotalSteps) {
+            digitalWrite(buzzer2Pin, LOW);
+            buzzer2PatternActive = false;
         }
     }
 }
@@ -79,47 +113,34 @@ void Buzzer::controlFromFirebase(bool buzzer01ring, bool buzzer02ring, int buzze
     if (buzzersound != lastVolume) {
         lastVolume = buzzersound;
         setVolume(buzzersound);
-        
-        Serial.print("Buzzer volume set to: ");
-        Serial.print(buzzersound);
-        Serial.println("%");
+        Serial.printf("Buzzer volume: %d%%\n", buzzersound);
     }
 
-    if (buzzer01ring) {
-        if (!buzzer1Active) {
-            buzzer1Active = true;
-            playTone(TONE_CONFIRM);
-        }
-    } else {
-        buzzer1Active = false;
+    if (buzzer01ring && !lastBuzzer1Ring) {
+        startPattern(1, TONE_CONFIRM);
     }
+    lastBuzzer1Ring = buzzer01ring;
 
-    if (buzzer02ring) {
-        if (!buzzer2Active) {
-            buzzer2Active = true;
-            playTone(TONE_EMERGENCY);
-        }
-    } else {
-        buzzer2Active = false;
+    if (buzzer02ring && !lastBuzzer2Ring) {
+        startPattern(2, TONE_EMERGENCY);
     }
+    lastBuzzer2Ring = buzzer02ring;
 }
 
 void Buzzer::singleBeep() {
-    playTone(TONE_CONFIRM);
+    startPattern(1, TONE_CONFIRM);
 }
 
 void Buzzer::doubleBeep() {
-    patternActive = true;
-    patternStartTime = millis();
-    currentStep = 0;
-    totalSteps = 3; // On, Off, On
-    nextStepTime = millis();
+    buzzer1PatternActive = true;
+    buzzer1Step = 0;
+    buzzer1TotalSteps = 3;
+    buzzer1NextStepTime = millis();
 }
 
 void Buzzer::tripleBeep() {
-    patternActive = true;
-    patternStartTime = millis();
-    currentStep = 0;
-    totalSteps = 5; // On, Off, On, Off, On
-    nextStepTime = millis();
+    buzzer1PatternActive = true;
+    buzzer1Step = 0;
+    buzzer1TotalSteps = 5;
+    buzzer1NextStepTime = millis();
 }

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

@@ -19,10 +19,20 @@ class Buzzer {
     void drive(uint16_t cycles, uint16_t freq);
 
     // Buzzer state tracking
-    bool buzzer1Active;
-    bool buzzer2Active;
+    bool buzzer1PatternActive;
+    bool buzzer2PatternActive;
+    int buzzer1Step;
+    int buzzer2Step;
+    unsigned long buzzer1NextStepTime;
+    unsigned long buzzer2NextStepTime;
+    int buzzer1TotalSteps;
+    int buzzer2TotalSteps;
     int lastVolume;
 
+    // Firebase state
+    bool lastBuzzer1Ring;
+    bool lastBuzzer2Ring;
+
 public:
     Buzzer();
     void begin();
@@ -39,14 +49,7 @@ class Buzzer {
     void controlFromFirebase(bool buzzer01ring, bool buzzer02ring, int buzzersound);
 
 private:
-    unsigned long patternStartTime;
-    unsigned long nextStepTime;
-    int currentStep;
-    int totalSteps;
-    bool patternActive;
-    
-    // Pattern definitions
-    void startPattern(int type);
+    void startPattern(int buzzerNum, BuzzerTone tone);
 };
 
 #endif

ESP32-S3-Main/src/communication/firebase_manager.cpp

@@ -7,13 +7,18 @@ void FirebaseManager::begin(const char* apiKey,
                             const char* userEmail,
                             const char* userPassword) {
 
+    Serial.println(" -> Config API...");
     config.api_key = apiKey;
     config.database_url = databaseUrl;
 
+    Serial.println(" -> Config Auth...");
     auth.user.email = userEmail;
     auth.user.password = userPassword;
 
+    Serial.println(" -> Calling Firebase.begin...");
     Firebase.begin(&config, &auth);
+    
+    Serial.println(" -> Setting reconnect...");
     Firebase.reconnectWiFi(true);
 
     Serial.println("Firebase Connected!");

ESP32-S3-Main/src/communication/firebase_manager.h

@@ -2,7 +2,7 @@
 #define FIREBASE_MANAGER_H
 
 #include <Arduino.h>
-#include <FirebaseESP32.h>
+#include <Firebase_ESP_Client.h>
 
 struct FirebaseTxData {
     // Sensor readings - SEND ONLY

ESP32-S3-Main/src/main.cpp

@@ -91,6 +91,7 @@ void setup() {
     Serial.println("Initiated.");
 
     Serial.print("Initializing Firebase...");
+    Serial.printf(" [Free Heap: %d] ", ESP.getFreeHeap());
     firebase.begin(FIREBASE_API_KEY, FIREBASE_DATABASE_URL, FIREBASE_USER_EMAIL, FIREBASE_USER_PASSWORD);
     Serial.println("Initiated.");
 
@@ -156,11 +157,6 @@ void setup() {
 }
 
 void loop() {
-    // Background Tasks
-    wifi.update();
-    lightSensor.update();
-    autoLighting->update();
-    motion.update();
     buzzer.update();
 
     // UART Acknowledgment Check
@@ -181,12 +177,20 @@ void loop() {
     if (millis() - lastFirebaseRx >= 100) { // Check every 100ms
         lastFirebaseRx = millis();
         if (firebase.receiveData(rx)) {
-            // Actuator real-time control
+            // Actuator real-time control (Overrides AutoLighting)
             buzzer.controlFromFirebase(rx.buzzer01ring, rx.buzzer02ring, rx.buzzersound);
             leds.controlFromFirebase(rx.lightadj_left, rx.lightadj_right);
         }
     }
 
+    // WiFi and AutoLighting updates (Moved to governed intervals)
+    wifi.update();
+    
+    // Only run AutoLighting if Firebase manual override is OFF (0 brightness)
+    if (rx.lightadj_left == 0 && rx.lightadj_right == 0) {
+        autoLighting->update();
+    }
+
     // Real-time sensor monitoring (Mode independent)
     heartRate.monitorHeartRate(rx.heartrate_start, currentHR, currentSpO2);
     ultrasonic.monitorUltrasonic(rx.ultrasonic_start, usCenter, usLeft, usRear, usRight);
@@ -217,6 +221,10 @@ void loop() {
         tx.compartment = currentCompartment;
 
         firebase.sendData(tx);
+
+        // Concise telemetry log to save time
+        Serial.printf("Bat: %.2fV | HR: %d | L:%d | C:%s\n", 
+                      tx.voltage / 1000.0f, tx.hr, tx.lightlevel, tx.colour.c_str());
     }
 
     // Update Menu and UI
@@ -269,6 +277,4 @@ void loop() {
         default:
             break;
     }
-
-    delay(10);
 }