fix invisible number input in webui. add aux indicator to webui and websocket.

include/Statemachine.h

@@ -124,6 +124,8 @@ private:
     // used for calibrating, in fill'n'water mode
     bool filling_started_empty;
     bool watering_started_full;
+
+    String menu_entered_digits;
 };
 
 #endif // _STATEMACHINE_H_

include/config.h

@@ -30,8 +30,8 @@
 #define BACK_TO_IDLE_TIMEOUT (5UL * 60UL * 1000UL)
 
 // in seconds
-#define MAX_TANK_FILL_TIME (67 + 3)
-#define AUTO_PUMP_RUNTIME 5
+#define MAX_TANK_FILL_TIME (70)
+#define AUTO_PUMP_RUNTIME 3
 #define AUTO_STIRR_RUNTIME 60
 #define MAX_AUTO_PLANT_RUNTIME (35 * 60)
 #define MAX_PUMP_RUNTIME 30
@@ -39,7 +39,7 @@
 #define MAX_AUX_RUNTIME (5 * 60)
 
 // Sketch version
-#define FIRMWARE_VERSION "0.2"
+#define FIRMWARE_VERSION "0.3"
 
 // all given in milliseconds
 #define SERVER_HANDLE_INTERVAL 10

include/config_pins.h

@@ -83,9 +83,14 @@
 
 #ifdef FUNCTION_CONTROL
 
+#define PLANT_COUNT 4
+#define PLANT_PINS 27, 14, 5, 18
+
+#define INLET_PIN 15
+
 // out 1, out 2, out 3, out 4, in
-#define VALVE_COUNT 5
-#define VALVE_PINS 27, 14, 5, 18, 15
+#define VALVE_COUNT (PLANT_COUNT + 1)
+#define VALVE_PINS PLANT_PINS, INLET_PIN
 
 // a, b, c
 #define PUMP_COUNT 3

src/Statemachine.cpp

@@ -133,6 +133,7 @@ Statemachine::Statemachine(print_fn _print, backspace_fn _backspace)
     into_state_time = 0;
     filling_started_empty = false;
     watering_started_full = false;
+    menu_entered_digits = "";
 }
 
 void Statemachine::begin(void) {
@@ -179,7 +180,7 @@ void Statemachine::input(int n) {
                 stop_time = millis();
                 switch_to(auto_mode_a);
             } else if (wl == Plants::invalid) {
-                error_condition = "Invalid sensor state";
+                error_condition = F("Invalid sensor state");
                 state = auto_mode_a;
                 switch_to(error);
             }
@@ -204,7 +205,7 @@ void Statemachine::input(int n) {
                 stop_time = millis();
                 switch_to(auto_mode_a);
             } else if (wl == Plants::invalid) {
-                error_condition = "Invalid sensor state";
+                error_condition = F("Invalid sensor state");
                 state = auto_mode_a;
                 switch_to(error);
             }
@@ -229,6 +230,10 @@ void Statemachine::input(int n) {
             if (db.hasDigits()) {
                 backspace();
                 db.removeDigit();
+                if (menu_entered_digits.length() > 0) {
+                    menu_entered_digits.remove(menu_entered_digits.length() - 1);
+                    switch_to(state);
+                }
             } else {
                 switch_to(auto_mode_b);
             }
@@ -249,14 +254,14 @@ void Statemachine::input(int n) {
                     stop_time = millis();
                     switch_to(auto_mode_b);
                 } else if (wl == Plants::invalid) {
-                    error_condition = "Invalid sensor state";
+                    error_condition = F("Invalid sensor state");
                     state = auto_mode_b;
                     switch_to(error);
                 }
             } else {
                 selected_id = number_input();
                 if ((selected_id <= 0) || (selected_id > plants.countPlants())) {
-                    error_condition = "Invalid plant ID!";
+                    error_condition = F("Invalid plant ID!");
                     switch_to(error);
                 } else {
                     selected_plants.set(selected_id - 1);
@@ -266,6 +271,8 @@ void Statemachine::input(int n) {
         } else {
             if (db.spaceLeft()) {
                 db.addDigit(n);
+                menu_entered_digits += String(n);
+                switch_to(state);
             } else {
                 backspace();
             }
@@ -281,6 +288,10 @@ void Statemachine::input(int n) {
             if (db.hasDigits()) {
                 backspace();
                 db.removeDigit();
+                if (menu_entered_digits.length() > 0) {
+                    menu_entered_digits.remove(menu_entered_digits.length() - 1);
+                    switch_to(state);
+                }
             } else {
                 switch_to(menu_b);
             }
@@ -292,7 +303,7 @@ void Statemachine::input(int n) {
             selected_id = number_input();
             
             if ((selected_id <= 0) || (selected_id > plants.countFertilizers())) {
-                error_condition = "Invalid pump ID!";
+                error_condition = F("Invalid pump ID!");
                 switch_to(error);
             } else {
                 switch_to(menu_pumps_time);
@@ -300,6 +311,8 @@ void Statemachine::input(int n) {
         } else {
             if (db.spaceLeft()) {
                 db.addDigit(n);
+                menu_entered_digits += String(n);
+                switch_to(state);
             } else {
                 backspace();
             }
@@ -309,6 +322,10 @@ void Statemachine::input(int n) {
             if (db.hasDigits()) {
                 backspace();
                 db.removeDigit();
+                if (menu_entered_digits.length() > 0) {
+                    menu_entered_digits.remove(menu_entered_digits.length() - 1);
+                    switch_to(state);
+                }
             } else {
                 switch_to(auto_mode_a);
             }
@@ -353,12 +370,12 @@ void Statemachine::input(int n) {
                             stop_time = millis();
                             switch_to(auto_mode_a);
                         } else if (wl == Plants::invalid) {
-                            error_condition = "Invalid sensor state";
+                            error_condition = F("Invalid sensor state");
                             state = auto_mode_a;
                             switch_to(error);
                         }
                     } else if (wl == Plants::invalid) {
-                        error_condition = "Invalid sensor state";
+                        error_condition = F("Invalid sensor state");
                         state = auto_mode_a;
                         switch_to(error);
                     }
@@ -366,7 +383,7 @@ void Statemachine::input(int n) {
             } else {
                 selected_id = number_input();
                 if ((selected_id <= 0) || (selected_id > plants.countPlants())) {
-                    error_condition = "Invalid plant ID!";
+                    error_condition = F("Invalid plant ID!");
                     switch_to(error);
                 } else {
                     selected_plants.set(selected_id - 1);
@@ -376,6 +393,8 @@ void Statemachine::input(int n) {
         } else {
             if (db.spaceLeft()) {
                 db.addDigit(n);
+                menu_entered_digits += String(n);
+                switch_to(state);
             } else {
                 backspace();
             }
@@ -399,7 +418,7 @@ void Statemachine::input(int n) {
         } else if (wl == Plants::empty) {
             switch_to(auto_mode_a);
         } else if (wl == Plants::invalid) {
-            error_condition = "Invalid sensor state";
+            error_condition = F("Invalid sensor state");
             state = auto_mode_a;
             switch_to(error);
         }
@@ -412,6 +431,10 @@ void Statemachine::input(int n) {
             if (db.hasDigits()) {
                 backspace();
                 db.removeDigit();
+                if (menu_entered_digits.length() > 0) {
+                    menu_entered_digits.remove(menu_entered_digits.length() - 1);
+                    switch_to(state);
+                }
             } else {
                 switch_to(menu_pumps);
             }
@@ -423,7 +446,7 @@ void Statemachine::input(int n) {
             selected_time = number_input();
             
             if ((selected_time <= 0) || (selected_time > MAX_PUMP_RUNTIME)) {
-                error_condition = "Invalid time range!";
+                error_condition = F("Invalid time range!");
                 switch_to(error);
             } else {
                 switch_to(menu_pumps_go);
@@ -431,6 +454,8 @@ void Statemachine::input(int n) {
         } else {
             if (db.spaceLeft()) {
                 db.addDigit(n);
+                menu_entered_digits += String(n);
+                switch_to(state);
             } else {
                 backspace();
             }
@@ -448,7 +473,7 @@ void Statemachine::input(int n) {
                 stop_time = millis();
                 switch_to(menu_pumps_done);
             } else if (wl == Plants::invalid) {
-                error_condition = "Invalid sensor state";
+                error_condition = F("Invalid sensor state");
                 state = menu_pumps;
                 switch_to(error);
             }
@@ -466,6 +491,10 @@ void Statemachine::input(int n) {
             if (db.hasDigits()) {
                 backspace();
                 db.removeDigit();
+                if (menu_entered_digits.length() > 0) {
+                    menu_entered_digits.remove(menu_entered_digits.length() - 1);
+                    switch_to(state);
+                }
             } else {
                 switch_to(menu_b);
             }
@@ -477,7 +506,7 @@ void Statemachine::input(int n) {
             selected_id = number_input();
             
             if ((selected_id <= 0) || (selected_id > (plants.countPlants() + 1))) {
-                error_condition = "Invalid valve ID!";
+                error_condition = F("Invalid valve ID!");
                 switch_to(error);
             } else {
                 switch_to(menu_valves_time);
@@ -485,6 +514,8 @@ void Statemachine::input(int n) {
         } else {
             if (db.spaceLeft()) {
                 db.addDigit(n);
+                menu_entered_digits += String(n);
+                switch_to(state);
             } else {
                 backspace();
             }
@@ -494,6 +525,10 @@ void Statemachine::input(int n) {
             if (db.hasDigits()) {
                 backspace();
                 db.removeDigit();
+                if (menu_entered_digits.length() > 0) {
+                    menu_entered_digits.remove(menu_entered_digits.length() - 1);
+                    switch_to(state);
+                }
             } else {
                 switch_to(menu_valves);
             }
@@ -505,7 +540,7 @@ void Statemachine::input(int n) {
             selected_time = number_input();
             
             if ((selected_time <= 0) || (selected_time > MAX_VALVE_RUNTIME)) {
-                error_condition = "Invalid time range!";
+                error_condition = F("Invalid time range!");
                 switch_to(error);
             } else {
                 switch_to(menu_valves_go);
@@ -513,6 +548,8 @@ void Statemachine::input(int n) {
         } else {
             if (db.spaceLeft()) {
                 db.addDigit(n);
+                menu_entered_digits += String(n);
+                switch_to(state);
             } else {
                 backspace();
             }
@@ -535,7 +572,7 @@ void Statemachine::input(int n) {
                 stop_time = millis();
                 switch_to(menu_valves_done);
             } else if (wl == Plants::invalid) {
-                error_condition = "Invalid sensor state";
+                error_condition = F("Invalid sensor state");
                 state = menu_valves;
                 switch_to(error);
             }
@@ -553,6 +590,10 @@ void Statemachine::input(int n) {
             if (db.hasDigits()) {
                 backspace();
                 db.removeDigit();
+                if (menu_entered_digits.length() > 0) {
+                    menu_entered_digits.remove(menu_entered_digits.length() - 1);
+                    switch_to(state);
+                }
             } else {
                 switch_to(menu_c);
             }
@@ -564,7 +605,7 @@ void Statemachine::input(int n) {
             selected_id = number_input();
 
             if ((selected_id <= 0) || (selected_id > plants.countAux())) {
-                error_condition = "Invalid valve ID!";
+                error_condition = F("Invalid valve ID!");
                 switch_to(error);
             } else {
                 switch_to(menu_aux_time);
@@ -572,6 +613,8 @@ void Statemachine::input(int n) {
         } else {
             if (db.spaceLeft()) {
                 db.addDigit(n);
+                menu_entered_digits += String(n);
+                switch_to(state);
             } else {
                 backspace();
             }
@@ -581,6 +624,10 @@ void Statemachine::input(int n) {
             if (db.hasDigits()) {
                 backspace();
                 db.removeDigit();
+                if (menu_entered_digits.length() > 0) {
+                    menu_entered_digits.remove(menu_entered_digits.length() - 1);
+                    switch_to(state);
+                }
             } else {
                 switch_to(menu_aux);
             }
@@ -592,7 +639,7 @@ void Statemachine::input(int n) {
             selected_time = number_input();
 
             if ((selected_time <= 0) || (selected_time > MAX_AUX_RUNTIME)) {
-                error_condition = "Invalid time range!";
+                error_condition = F("Invalid time range!");
                 switch_to(error);
             } else {
                 switch_to(menu_aux_go);
@@ -600,6 +647,8 @@ void Statemachine::input(int n) {
         } else {
             if (db.spaceLeft()) {
                 db.addDigit(n);
+                menu_entered_digits += String(n);
+                switch_to(state);
             } else {
                 backspace();
             }
@@ -669,7 +718,7 @@ void Statemachine::act(void) {
             switch_to((state == menu_pumps_run) ? menu_pumps_done : menu_valves_done);
         } else if (wl == Plants::invalid) {
             plants.abort();
-            error_condition = "Invalid sensor state";
+            error_condition = F("Invalid sensor state");
             state = (state == menu_pumps_run) ? menu_pumps : menu_valves;
             switch_to(error);
         }
@@ -686,7 +735,7 @@ void Statemachine::act(void) {
             switch_to(menu_valves_done);
         } else if (wl == Plants::invalid) {
             plants.abort();
-            error_condition = "Invalid sensor state";
+            error_condition = F("Invalid sensor state");
             state = menu_valves;
             switch_to(error);
         }
@@ -717,7 +766,7 @@ void Statemachine::act(void) {
                     stop_time = millis();
                     switch_to(auto_done);
                 } else if (wl == Plants::invalid) {
-                    error_condition = "Invalid sensor state";
+                    error_condition = F("Invalid sensor state");
                     state = auto_mode_a;
                     switch_to(error);
                 }
@@ -775,7 +824,7 @@ void Statemachine::act(void) {
                     stop_time = millis();
                     switch_to(auto_mode_a);
                 } else if (wl == Plants::invalid) {
-                    error_condition = "Invalid sensor state";
+                    error_condition = F("Invalid sensor state");
                     state = auto_mode_a;
                     switch_to(error);
                 }
@@ -784,7 +833,7 @@ void Statemachine::act(void) {
             }
         } else if (wl == Plants::invalid) {
             plants.abort();
-            error_condition = "Invalid sensor state";
+            error_condition = F("Invalid sensor state");
             state = auto_mode_a;
             switch_to(error);
         }
@@ -839,7 +888,7 @@ void Statemachine::act(void) {
             switch_to(auto_done);
         } else if (wl == Plants::invalid) {
             plants.abort();
-            error_condition = "Invalid sensor state";
+            error_condition = F("Invalid sensor state");
             state = auto_mode_a;
             switch_to(error);
         }
@@ -876,10 +925,12 @@ void Statemachine::switch_to(States s) {
         debug.print(state_names[old_state]);
         debug.print(" --> ");
         debug.println(state_names[state]);
+
+        menu_entered_digits = "";
     }
     
     if (s == init) {
-        String a = String("- Giess-o-mat V") + FIRMWARE_VERSION + String(" -");
+        String a = String(F("- Giess-o-mat V")) + FIRMWARE_VERSION + String(F(" -"));
         
         print(a.c_str(),
               "Usage:  Enter number",
@@ -982,11 +1033,13 @@ void Statemachine::switch_to(States s) {
               -1);
     } else if ((s == auto_plant) || (s == fillnwater_plant)) {
         String a = String("(Input 1 to ") + String(plants.countPlants()) + String(")");
-        
+        String b = String(F("Plant: ")) + menu_entered_digits;
+
+
         print("--- Select Plant ---",
               "Leave empty if done!",
               a.c_str(),
-              "Plant: ",
+              b.c_str(),
               3);
     } else if ((s == auto_plant_run) || (s == fillnwater_plant_run)) {
         unsigned long runtime = millis() - start_time;
@@ -1044,19 +1097,21 @@ void Statemachine::switch_to(States s) {
 #endif // PLATFORM_ESP
     } else if (s == menu_pumps) {
         String a = String("(Input 1 to ") + String(plants.countFertilizers()) + String(")");
+        String b = String(F("Pump: ")) + menu_entered_digits;
         
         print("------- Pump -------",
               "Please select pump",
               a.c_str(),
-              "Pump: ",
+              b.c_str(),
               3);
     } else if (s == menu_pumps_time) {
         String header = String("------ Pump ") + String(selected_id) + String(" ------");
+        String b = String(F("Runtime: ")) + menu_entered_digits;
         
         print(header.c_str(),
               "Please set runtime",
               "(Input in seconds)",
-              "Runtime: ",
+              b.c_str(),
               3);
     } else if (s == menu_pumps_go) {
         String a = String("Pump No. ") + String(selected_id);
@@ -1106,19 +1161,21 @@ void Statemachine::switch_to(States s) {
 #endif // PLATFORM_ESP
     } else if (s == menu_valves) {
         String a = String("(Input 1 to ") + String(plants.countPlants() + 1) + String(")");
+        String b = String(F("Valve: ")) + menu_entered_digits;
         
         print("------ Valves ------",
               "Please select valve",
               a.c_str(),
-              "Valve: ",
+              b.c_str(),
               3);
     } else if (s == menu_valves_time) {
         String header = String("----- Valve  ") + String(selected_id) + String(" -----");
+        String b = String(F("Runtime: ")) + menu_entered_digits;
         
         print(header.c_str(),
               "Please set runtime",
               "(Input in seconds)",
-              "Runtime: ",
+              b.c_str(),
               3);
     } else if (s == menu_valves_go) {
         String a = String("Valve No. ") + String(selected_id);
@@ -1170,19 +1227,21 @@ void Statemachine::switch_to(States s) {
 #endif // PLATFORM_ESP
     } else if (s == menu_aux) {
         String a = String("(Input 1 to ") + String(plants.countAux()) + String(")");
+        String b = String(F("Aux.: ")) + menu_entered_digits;
 
         print("------- Aux. -------",
               "Please select aux.",
               a.c_str(),
-              "Aux.: ",
+              b.c_str(),
               3);
     } else if (s == menu_aux_time) {
         String header = String("------ Aux  ") + String(selected_id) + String(" ------");
+        String b = String(F("Runtime: ")) + menu_entered_digits;
 
         print(header.c_str(),
               "Please set runtime",
               "(Input in seconds)",
-              "Runtime: ",
+              b.c_str(),
               3);
     } else if (s == menu_aux_go) {
         String a = String("Aux No. ") + String(selected_id);

src/WifiStuff.cpp

@@ -205,6 +205,18 @@ void wifi_send_status_broadcast(void) {
         }
     }
     ws += " ],\n";
+
+    ws += F("\"aux\": [ ");
+    for (int i = 0; i < AUX_COUNT; i++) {
+        ws += "\"";
+        ws += get_plants()->getAux()->getPin(i) ? "1" : "0";
+        ws += "\"";
+
+        if (i < (AUX_COUNT - 1)) {
+            ws += ", ";
+        }
+    }
+    ws += " ],\n";
     
     ws += "\"switchstate\": \"";
     Plants::Waterlevel wl = get_plants()->getWaterlevel();
@@ -279,6 +291,14 @@ void handleRoot() {
     message += F("padding: 2em;\n");
     message += F("margin: 1em;\n");
     message += F("}\n");
+
+    message += F(".aux {\n");
+    message += F("width: max-content;\n");
+    message += F("border: 1px solid black;\n");
+    message += F("border-radius: 50%;\n");
+    message += F("padding: 2em;\n");
+    message += F("margin: 1em;\n");
+    message += F("}\n");
     
     message += F(".info {\n");
     message += F("width: max-content;\n");
@@ -454,6 +474,22 @@ void handleRoot() {
         message += F("</div>");
     }
     message += F("</div><hr>\n");
+
+    message += F("Aux:\n");
+    message += F("<div class='container'>\n");
+    for (int i = 0; i < AUX_COUNT; i++) {
+        message += F("<div class='aux' style='background-color: ");
+        if (get_plants()->getAux()->getPin(i)) {
+            message += F("red");
+        } else {
+            message += F("green");
+        }
+        message += F(";'>A");
+        message += String(i + 1);
+        message += F("</div>");
+    }
+    message += F("</div><hr>\n");
+
     message += F("Green means valve is closed / pump is off / switch is not submersed.\n");
     message += F("<br>\n");
     message += F("Red means valve is open / pump is running / switch is submersed.</div>\n");
@@ -596,6 +632,17 @@ void handleRoot() {
     message += F(           "switches[i].style = 'background-color: red;';\n");
     message += F(       "}\n");
     message += F(    "}\n");
+
+    message += F(    "for (let i = 0; i < ");
+    message += String(AUX_COUNT);
+    message += F("; i++) {\n");
+    message += F(       "var aux = document.getElementsByClassName('aux');\n");
+    message += F(       "if (msg.aux[i] == '0') {\n");
+    message += F(           "aux[i].style = 'background-color: green;';\n");
+    message += F(       "} else {\n");
+    message += F(           "aux[i].style = 'background-color: red;';\n");
+    message += F(       "}\n");
+    message += F(    "}\n");
     
     message += F(    "var switchstate = document.getElementById('switchstate');\n");
     message += F(    "switchstate.innerHTML = msg.switchstate;\n");