feat(drinks-machine): implement sequential pump activation and PWM speed control

Author: bert27

server/firmware/serverEspReact/apps/drinks machine/services/PumpsService.hpp

@@ -18,15 +18,15 @@ class PumpsService {
         int pins[] = {PIN_PUMP_1, PIN_PUMP_2, PIN_PUMP_3, PIN_PUMP_4};
         for(int p : pins) {
             pinMode(p, OUTPUT);
-            digitalWrite(p, 0); 
+            analogWrite(p, 0); 
         }
     }
 
-    // Calculates duration based on ingredients and 20ml calibration
+    // Calculates total duration by summing sequential ingredient times
     unsigned long calculateServingDuration(const MenuEntry& entry) {
-        unsigned long maxTime = 0;
+        unsigned long totalTime = 0;
 
-        Serial.printf("\n[Pumps] --- Analyzing Recipe: %s ---\n", entry.name.c_str());
+        Serial.printf("\n[Pumps] --- Analyzing Recipe (Sequential): %s ---\n", entry.name.c_str());
 
         if (entry.index >= 0 && entry.index < (int)MenuService::getInstance().cocktails.size()) {
             const auto& recipe = MenuService::getInstance().cocktails[entry.index].ingredients;
@@ -36,17 +36,13 @@ class PumpsService {
                 bool matched = false;
                 for (const auto& b : bottles) {
                     if (b.liquid == ing.name) {
-                        // ratePerMl = Seconds for 1ml (e.g. 1.6s / 20 = 0.08s)
                         float ratePerMl = b.timeCalibration / 20.0f;
-                        // durationMs = ml * rate * 1000 (e.g. 150ml * 0.08s * 1000 = 12000ms)
                         unsigned long durationMs = (unsigned long)(ing.quantity * ratePerMl * 1000.0f);
 
                         Serial.printf(" - %s: %dml (Pump %d, %.2fs/20ml) -> Duration: %lums\n", 
                                       ing.name.c_str(), ing.quantity, b.id, b.timeCalibration, durationMs);
 
-                        if (durationMs > maxTime) {
-                            maxTime = durationMs;
-                        }
+                        totalTime += durationMs;
                         matched = true;
                         break;
                     }
@@ -56,18 +52,18 @@ class PumpsService {
                 }
             }
 
-            // Safety limit (2 minutes)
-            if (maxTime == 0 || maxTime > 120000) {
-                Serial.printf(" ! Unusual duration calculated (%lums). Forcing to 3000ms for safety.\n", maxTime);
-                maxTime = 3000; 
+            // Safety limit (4 minutes for sequential)
+            if (totalTime == 0 || totalTime > 240000) {
+                Serial.printf(" ! Unusual duration calculated (%lums). Forcing to 3000ms for safety.\n", totalTime);
+                totalTime = 3000; 
             }
         } else {
             Serial.println(" ! Error: Invalid recipe index.");
-            maxTime = 3000;
+            totalTime = 3000;
         }
 
-        Serial.printf("[Pumps] Total cycle duration: %lums\n\n", maxTime);
-        return maxTime;
+        Serial.printf("[Pumps] Total sequence duration: %lums\n\n", totalTime);
+        return totalTime;
     }
 
     void processPumps(bool isServing, const MenuEntry& entry, unsigned long elapsed) {
@@ -81,22 +77,34 @@ class PumpsService {
         const auto& recipe = MenuService::getInstance().cocktails[entry.index].ingredients;
         const auto& bottles = MenuService::getInstance().bottles;
 
+        unsigned long cumulativeTime = 0;
+        bool anyPumpActive = false;
+
         for (const auto& ing : recipe) {
+            bool found = false;
             for (const auto& b : bottles) {
                 if (b.liquid == ing.name) {
                     float ratePerMl = b.timeCalibration / 20.0f;
                     unsigned long durationMs = (unsigned long)(ing.quantity * ratePerMl * 1000.0f);
 
-                    if (elapsed < durationMs) {
-                        pinMode(b.gpio, OUTPUT);
-                        digitalWrite(b.gpio, HIGH);
+                    if (!anyPumpActive && elapsed >= cumulativeTime && elapsed < (cumulativeTime + durationMs)) {
+                        analogWrite(b.gpio, b.pwm);
+                        anyPumpActive = true;
                     } else {
-                        pinMode(b.gpio, OUTPUT);
-                        digitalWrite(b.gpio, LOW);
+                        analogWrite(b.gpio, 0);
                     }
+                    cumulativeTime += durationMs;
+                    found = true;
                     break;
                 }
             }
+            if (!found) {
+                // Should not happen as it was checked in calculateServingDuration
+            }
+        }
+
+        if (!anyPumpActive) {
+            offAllPumps();
         }
     }