add full-auto mode. tweaks to web ui. allow use without wifi.

include/BoolField.h

@@ -26,7 +26,7 @@ public:
     ~BoolField(void);
     
     void clear(void);
-    void set(int n);
+    void set(int n, bool value = true);
     bool isSet(int n);
     int countSet(void);
     int getFirstSet(void);

include/Statemachine.h

@@ -36,6 +36,7 @@ public:
         
         auto_mode_a, // select mode 1
         auto_mode_b, // select mode 2
+        auto_mode_c, // select mode 3
         auto_fert_a, // select fertilizer 1
         auto_fert_b, // select fertilizer 2
         auto_fert_run,
@@ -51,6 +52,20 @@ public:
         fillnwater_kickstart_run,
         fillnwater_plant_run,
 
+        fullauto_fert, // d i a
+        fullauto_plant, // d i a
+        fullauto_stirr_run, // d i a
+        fullauto_fert_run, // d i a
+        fullauto_tank_run, // d i a
+        fullauto_kickstart_run, // d i a
+        fullauto_plant_run, // d i a
+        fullauto_plant_overrun, // d i a
+        fullauto_tank_purge_run, // d i a
+        fullauto_kickstart_purge_run, // d i a
+        fullauto_plant_purge_run, // d i a
+        fullauto_plant_purge_overrun, // d i a
+        fullauto_done, // d i a
+
         automation_mode,
         
         menu_pumps, // selet pump
@@ -118,6 +133,7 @@ private:
     backspace_fn backspace;
     
     BoolField selected_plants;
+    BoolField selected_ferts;
     uint32_t selected_id; // pump or valve id
     uint32_t selected_time; // runtime
     unsigned long start_time, stop_time, last_animation_time;

include/config.h

@@ -36,10 +36,12 @@
 #define MAX_PUMP_RUNTIME 30
 #define MAX_VALVE_RUNTIME (45 * 60)
 #define MAX_AUX_RUNTIME (5 * 60)
-#define KICKSTART_RUNTIME 10
+#define KICKSTART_RUNTIME 30
+#define OVERRUN_RUNTIME 60
+#define PURGE_FILL_RUNTIME 10
 
 // Sketch version
-#define FIRMWARE_VERSION "0.5"
+#define FIRMWARE_VERSION "0.6"
 
 // all given in milliseconds
 #define SERVER_HANDLE_INTERVAL 10
@@ -49,6 +51,9 @@
 #define LED_CONNECT_BLINK_INTERVAL 250
 #define LED_ERROR_BLINK_INTERVAL 100
 
+// each attempt takes LED_CONNECT_BLINK_INTERVAL ms
+#define MAX_WIFI_CONNECT_ATTEMPTS 40
+
 #define INVERT_SENSOR_BOTTOM
 //#define INVERT_SENSOR_TOP
 

include/config_pins.h

@@ -66,7 +66,7 @@
 #define PUMP_PINS 16, 17, 18
 
 // ensure a default for each PUMP_COUNT
-#define AUTO_PUMP_RUNTIME { 20, 5, 5 }
+#define AUTO_PUMP_RUNTIME { 20, 10, 10 }
 
 // bottom, top
 #define SWITCH_COUNT 2
@@ -136,14 +136,14 @@
 
 // kickstarting pumps, same count as plants!
 // set pin to -1 to disable kickstart for this plant.
-#define KICKSTART_PINS -1, -1, -1, -1, 108, 109, 110, 111
+#define KICKSTART_PINS 112, 113, 114, 115, 108, 109, 110, 111
 
 // a, b, c
 #define PUMP_COUNT 3
 #define PUMP_PINS 2, 0, 4
 
 // ensure a default for each PUMP_COUNT
-#define AUTO_PUMP_RUNTIME { 20, 5, 5 }
+#define AUTO_PUMP_RUNTIME { 20, 10, 10 }
 
 // stirrer, locks
 #define STIRRER_COUNT 1

src/BoolField.cpp

@@ -34,8 +34,8 @@ void BoolField::clear(void) {
     }
 }
 
-void BoolField::set(int n) {
-    field[n] = true;
+void BoolField::set(int n, bool value) {
+    field[n] = value;
 }
 
 bool BoolField::isSet(int n) {

src/DebugLog.cpp

@@ -67,11 +67,11 @@ void DebugLog::print(int n) {
 }
 
 void DebugLog::println(void) {
-    print(String('\n'));
+    print(String(F("\r\n")));
 }
 
 void DebugLog::println(String s) {
-    s += '\n';
+    s += String(F("\r\n"));
     print(s);
 }
 

src/Functionality.cpp

@@ -540,7 +540,7 @@ void write_to_all(const char *a, const char *b,
     //debug.println("write_to_all i2c");
     
     // rarely some lines don't update
-    delay(100);
+    delay(50);
 
     for (int i = 0; i < 4; i++) {
         Wire.beginTransmission(OWN_I2C_ADDRESS);

src/WifiStuff.cpp

@@ -50,6 +50,7 @@ WebSocketsServer socket = WebSocketsServer(81);
 SimpleUpdater updater;
 unsigned long last_server_handle_time = 0;
 unsigned long last_websocket_update_time = 0;
+int wifi_ok = 0;
 
 String message_buffer_a;
 String message_buffer_b;
@@ -259,8 +260,14 @@ void handleRoot() {
     message += F("<title>Gieß-o-mat</title>\n");
     
     message += F("<style type='text/css'>\n");
+    message += F(".head {\n");
+    message += F("text-align: center;\n");
+    message += F("}\n");
+
     message += F(".container {\n");
     message += F("display: flex;\n");
+    message += F("max-width: 1200px;\n");
+    message += F("margin: auto;\n");
     message += F("}\n");
     
     message += F(".ui {\n");
@@ -284,8 +291,8 @@ void handleRoot() {
     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("padding: 1em;\n");
+    message += F("margin: 0.5em;\n");
     message += F("}\n");
     
     message += F(".info {\n");
@@ -299,7 +306,9 @@ void handleRoot() {
     message += F(".log {\n");
     message += F("max-height: 300px;\n");
     message += F("padding: 0 1.0em;\n");
-    message += F("margin: 1em 0;\n");
+    message += F("max-width: 1200px;\n");
+    message += F("margin: auto;\n");
+    message += F("margin-top: 1.5em;\n");
     message += F("border: 1px dashed black;\n");
     message += F("font-family: monospace;\n");
     message += F("overflow-y: scroll;\n");
@@ -356,8 +365,8 @@ void handleRoot() {
     message += F("</style>\n");
     
     message += F("</head><body>\n");
-    message += F("<h1>Gieß-o-mat</h1>\n");
-    
+    message += F("<h1 class='head'>Gieß-o-mat</h1>\n");
+
     message += F("<div class='container'>\n");
     message += F("<div class='ui'>\n");
     message += F("<pre class='lcd'>\n");
@@ -509,6 +518,9 @@ void handleRoot() {
     message += F("\n</p><p>\n");
     message += F("MAC: ");
     message += WiFi.macAddress();
+    message += F("\n<br>\n");
+    message += F("IPv4: ");
+    message += WiFi.localIP().toString();
     message += F("\n</p>\n");
 
 #if defined(ARDUINO_ARCH_ESP8266)
@@ -597,7 +609,7 @@ void handleRoot() {
     message += F(    "}\n");
     message += F(    "var msg = JSON.parse(e.data);\n");
     message += F(    "var str = msg.a + '\\n' + msg.b + '\\n' + msg.c + '\\n' + msg.d;\n");
-    message += F(    "console.log(str);\n");
+    //message += F(    "console.log(str);\n");
     message += F(    "var lcd = document.getElementsByClassName('lcd');\n");
     message += F(    "lcd[0].innerHTML = str;\n");
     message += F(    "var state = document.getElementById('state');\n");
@@ -696,6 +708,8 @@ void wifi_setup() {
     // Build hostname string
     String hostname = "giess-o-mat";
 
+    int ws = 0, connect_attempts = 0;
+
 #if defined(ARDUINO_ARCH_ESP8266)
 
     // Connect to WiFi AP
@@ -705,12 +719,15 @@ void wifi_setup() {
     
     debug.print("WiFi: connecting");
     WiFi.begin(WIFI_SSID, WIFI_PW);
-    while (WiFi.status() != WL_CONNECTED) {
-        debug.print(".");
+
+    while (((ws = WiFi.status()) != WL_CONNECTED) && (connect_attempts < MAX_WIFI_CONNECT_ATTEMPTS)) {
+        connect_attempts++;
+        debug.print(String(" ") + String(ws));
         delay(LED_CONNECT_BLINK_INTERVAL);
         digitalWrite(BUILTIN_LED_PIN, !digitalRead(BUILTIN_LED_PIN));
     }
     debug.println();
+    debug.println(String("WiFi: status=") + String(WiFi.status()));
     
 #elif defined(ARDUINO_ARCH_ESP32)
 
@@ -736,14 +753,13 @@ void wifi_setup() {
     WiFi.mode(WIFI_STA);
     WiFi.begin(WIFI_SSID, WIFI_PW);
 
-    int ws;
-    while ((ws = WiFi.status()) != WL_CONNECTED) {
+    while (((ws = WiFi.status()) != WL_CONNECTED) && (connect_attempts < MAX_WIFI_CONNECT_ATTEMPTS)) {
+        connect_attempts++;
         debug.print(String(" ") + String(ws));
         delay(LED_CONNECT_BLINK_INTERVAL);
         digitalWrite(BUILTIN_LED_PIN, !digitalRead(BUILTIN_LED_PIN));
     }
     debug.println();
-
     debug.println(String("WiFi: status=") + String(WiFi.status()));
     
     // Set hostname workaround
@@ -752,8 +768,16 @@ void wifi_setup() {
 
 #endif
 
+    if ((connect_attempts >= MAX_WIFI_CONNECT_ATTEMPTS)
+            || (WiFi.status() != WL_CONNECTED)) {
+        debug.println("WiFi: init failed!");
+        wifi_ok = 0;
+        return;
+    }
+    wifi_ok = 1;
+
     debug.print("WiFi: got IPv4: ");
-    debug.println(WiFi.localIP());
+    debug.println(WiFi.localIP().toString());
 
 #ifdef ENABLE_INFLUXDB_LOGGING
     // Setup InfluxDB Client
@@ -781,6 +805,16 @@ void wifi_setup() {
 }
 
 void wifi_run() {
+    // reset ESP every 6h to be safe
+    if ((millis() >= (6UL * 60UL * 60UL * 1000UL)) && (sm_is_idle())) {
+        ESP.restart();
+    }
+
+    if (!wifi_ok) {
+        // nothing to handle
+        return;
+    }
+
     if ((millis() - last_server_handle_time) >= SERVER_HANDLE_INTERVAL) {
         last_server_handle_time = millis();
         server.handleClient();
@@ -796,11 +830,6 @@ void wifi_run() {
         wifi_send_status_broadcast();
     }
     
-    // reset ESP every 6h to be safe
-    if ((millis() >= (6UL * 60UL * 60UL * 1000UL)) && (sm_is_idle())) {
-        ESP.restart();
-    }
-    
 #ifdef ENABLE_GPIO_TEST
     if (runningGpioTest && ((millis() - lastGpioTime) >= GPIO_TEST_INTERVAL)) {
         gpioTestState = !gpioTestState;