differing runtimes per pump

include/config.h

@@ -31,7 +31,6 @@
 
 // in seconds
 #define MAX_TANK_FILL_TIME (80)
-#define AUTO_PUMP_RUNTIME 4
 #define AUTO_STIRR_RUNTIME 60
 #define MAX_AUTO_PLANT_RUNTIME (35 * 60)
 #define MAX_PUMP_RUNTIME 30

include/config_pins.h

@@ -65,6 +65,9 @@
 #define PUMP_COUNT 3
 #define PUMP_PINS 16, 17, 18
 
+// ensure a default for each PUMP_COUNT
+#define AUTO_PUMP_RUNTIME { 20, 5, 5 }
+
 // bottom, top
 #define SWITCH_COUNT 2
 #define SWITCH_PINS 19, 20
@@ -139,6 +142,9 @@
 #define PUMP_COUNT 3
 #define PUMP_PINS 2, 0, 4
 
+// ensure a default for each PUMP_COUNT
+#define AUTO_PUMP_RUNTIME { 20, 5, 5 }
+
 // stirrer, locks
 #define STIRRER_COUNT 1
 #define LOCK_COUNT 2

src/Statemachine.cpp

@@ -115,6 +115,8 @@ static const char *state_names[] = {
     stringify(error)
 };
 
+static int auto_pump_runtime[PUMP_COUNT] = AUTO_PUMP_RUNTIME;
+
 const char *Statemachine::getStateName(void) {
     return state_names[state];
 }
@@ -290,12 +292,13 @@ void Statemachine::input(int n) {
             switch_to((state == auto_mode_a) ? auto_mode_b : auto_mode_a);
         }
     } else if ((state == auto_fert_a) || (state == auto_fert_b)) {
+        // TODO fertilizer number currently "hardcoded" to 3 in UI
         if ((n >= 1) && (n <= 3)) {
             auto wl = plants.getWaterlevel();
             if ((wl != Plants::full) && (wl != Plants::invalid)) {
                 plants.startFertilizer(n - 1);
                 selected_id = n;
-                selected_time = AUTO_PUMP_RUNTIME;
+                selected_time = auto_pump_runtime[n - 1];
                 start_time = millis();
                 switch_to(auto_fert_run);
             } else if (wl == Plants::full) {