include/config.h

@@ -36,9 +36,10 @@
 #define MAX_PUMP_RUNTIME 30
 #define MAX_VALVE_RUNTIME (45 * 60)
 #define MAX_AUX_RUNTIME (5 * 60)
-#define KICKSTART_RUNTIME 30
-#define OVERRUN_RUNTIME 60
-#define PURGE_FILL_RUNTIME 10
+#define KICKSTART_RUNTIME 45
+#define OVERRUN_RUNTIME 75
+#define PURGE_FILL_RUNTIME 20
+#define FULLAUTO_MIN_PLANT_COUNT 2
 
 // Sketch version
 #define FIRMWARE_VERSION "0.6"

src/Statemachine.cpp

@@ -414,6 +414,8 @@ void Statemachine::input(int n) {
         }
     } else if (state == fullauto_fert_run) {
         // allow user to stop fertizilers and continue with tank filling
+        plants.abort();
+        stop_time = millis();
         auto wl = plants.getWaterlevel();
         if ((wl != Plants::full) && (wl != Plants::invalid)) {
             // if the waterlevel is currently empty, we
@@ -661,6 +663,12 @@ void Statemachine::input(int n) {
                     return;
                 }
 
+#ifdef FULLAUTO_MIN_PLANT_COUNT
+                if (selected_plants.countSet() < FULLAUTO_MIN_PLANT_COUNT) {
+                    return;
+                }
+#endif
+
                 // check if we need to run fertilizers
                 if (selected_ferts.countSet() > 0) {
                     // stirr before pumping fertilizers
@@ -1470,16 +1478,7 @@ void Statemachine::act(void) {
                     debug.println("ms");
 
 #if defined(PLATFORM_ESP)
-                    bool success = wifi_write_database(time_to_fill, "calibrated_filling", -1);
-                    if (!success) {
-                        debug.print("Error writing to InfluxDB ");
-                        debug.print(INFLUXDB_HOST);
-                        debug.print(":");
-                        debug.print(INFLUXDB_PORT);
-                        debug.print("/");
-                        debug.print(INFLUXDB_DATABASE);
-                        debug.println("/calibrated_filling");
-                    }
+                    wifi_write_database(time_to_fill, "calibrated_filling", -1);
 #endif // PLATFORM_ESP
                 }
 
@@ -1637,18 +1636,9 @@ void Statemachine::act(void) {
                     debug.print(String(time_to_water));
                     debug.println("ms");
 
-    #if defined(PLATFORM_ESP)
-                    bool success = wifi_write_database(time_to_water, "calibrated_watering", selected_plants.getFirstSet() + 1);
-                    if (!success) {
-                        debug.print("Error writing to InfluxDB ");
-                        debug.print(INFLUXDB_HOST);
-                        debug.print(":");
-                        debug.print(INFLUXDB_PORT);
-                        debug.print("/");
-                        debug.print(INFLUXDB_DATABASE);
-                        debug.println("/calibrated_watering");
-                    }
-    #endif // PLATFORM_ESP
+#if defined(PLATFORM_ESP)
+                    wifi_write_database(time_to_water, "calibrated_watering", selected_plants.getFirstSet() + 1);
+#endif // PLATFORM_ESP
                 }
             }
 
@@ -1917,29 +1907,11 @@ void Statemachine::switch_to(States s) {
         if ((old_state == auto_plant_run) || (old_state == fillnwater_plant_run)) {
             for (int i = 0; i < plants.countPlants(); i++) {
                 if (selected_plants.isSet(i)) {
-                    bool success = wifi_write_database(runtime / 1000, "plant", i + 1);
-                    if (!success) {
-                        debug.print("Error writing to InfluxDB ");
-                        debug.print(INFLUXDB_HOST);
-                        debug.print(":");
-                        debug.print(INFLUXDB_PORT);
-                        debug.print("/");
-                        debug.print(INFLUXDB_DATABASE);
-                        debug.println("/plant");
-                    }
+                    wifi_write_database(runtime / 1000, "plant", i + 1);
                 }
             }
         } else if (old_state == auto_fert_run) {
-            bool success = wifi_write_database(runtime / 1000, "fertilizer", selected_id);
-            if (!success) {
-                debug.print("Error writing to InfluxDB ");
-                debug.print(INFLUXDB_HOST);
-                debug.print(":");
-                debug.print(INFLUXDB_PORT);
-                debug.print("/");
-                debug.print(INFLUXDB_DATABASE);
-                debug.println("/fertilizer");
-            }
+            wifi_write_database(runtime / 1000, "fertilizer", selected_id);
         }
 #endif // PLATFORM_ESP
     } else if (s == menu_pumps) {
@@ -1995,16 +1967,7 @@ void Statemachine::switch_to(States s) {
 
 #if defined(PLATFORM_ESP)
         unsigned long runtime = stop_time - start_time;
-        bool success = wifi_write_database(runtime / 1000, "fertilizer", selected_id);
-        if (!success) {
-            debug.print("Error writing to InfluxDB ");
-            debug.print(INFLUXDB_HOST);
-            debug.print(":");
-            debug.print(INFLUXDB_PORT);
-            debug.print("/");
-            debug.print(INFLUXDB_DATABASE);
-            debug.println("/fertilizer");
-        }
+        wifi_write_database(runtime / 1000, "fertilizer", selected_id);
 #endif // PLATFORM_ESP
     } else if (s == menu_valves) {
         String a = String(F("(Input 1 to ")) + String(plants.countPlants() + 1) + String(F(")"));
@@ -2060,16 +2023,7 @@ void Statemachine::switch_to(States s) {
 #if defined(PLATFORM_ESP)
         unsigned long runtime = stop_time - start_time;
         if (selected_id <= plants.countPlants()) {
-            bool success = wifi_write_database(runtime / 1000, "plant", selected_id);
-            if (!success) {
-                debug.print("Error writing to InfluxDB ");
-                debug.print(INFLUXDB_HOST);
-                debug.print(":");
-                debug.print(INFLUXDB_PORT);
-                debug.print("/");
-                debug.print(INFLUXDB_DATABASE);
-                debug.println("/plant");
-            }
+            wifi_write_database(runtime / 1000, "plant", selected_id);
         }
 #endif // PLATFORM_ESP
     } else if (s == menu_aux) {

src/WifiStuff.cpp

@@ -119,6 +119,17 @@ bool wifi_write_database(int duration, const char *type, int id) {
     success = influx.write(measurement);
 #endif // ENABLE_INFLUXDB_LOGGING
 
+    if (!success) {
+        debug.print("Error writing to InfluxDB ");
+        debug.print(INFLUXDB_HOST);
+        debug.print(":");
+        debug.print(INFLUXDB_PORT);
+        debug.print("/");
+        debug.print(INFLUXDB_DATABASE);
+        debug.print("/");
+        debug.println(type);
+    }
+
     return success;
 }
 
@@ -134,6 +145,10 @@ void wifi_schedule_websocket(void) {
 }
 
 void wifi_send_status_broadcast(void) {
+    if (WiFi.status() != WL_CONNECTED) {
+        return;
+    }
+
     if (socket.connectedClients() <= 0) {
         return;
     }