small safety update

include/config.h

@@ -29,9 +29,11 @@
 #define DISPLAY_BACKLIGHT_TIMEOUT (5UL * 60UL * 1000UL)
 
 // in seconds
-#define MAX_TANK_FILL_TIME 10
+#define MAX_TANK_FILL_TIME 30
 #define AUTO_PUMP_RUNTIME 5
-#define MAX_AUTO_PLANT_RUNTIME 15
+#define MAX_AUTO_PLANT_RUNTIME (10 * 60)
+#define MAX_PUMP_RUNTIME 30
+#define MAX_VALVE_RUNTIME (10 * 60)
 
 // Sketch version
 #define FIRMWARE_VERSION "0.2"
@@ -47,7 +49,8 @@
 #define INVERT_SENSOR_BOTTOM
 //#define INVERT_SENSOR_TOP
 
-//#define CHECK_SENSORS_VALVE_PUMP_MENU
+#define CHECK_SENSORS_VALVE_PUMP_MENU_FULL // be careful when uncommenting this!
+//#define CHECK_SENSORS_VALVE_PUMP_MENU_EMPTY
 
 #define OWN_I2C_ADDRESS 0x42
 #define I2C_BUS_SPEED 400000

src/Statemachine.cpp

@@ -272,7 +272,7 @@ void Statemachine::input(int n) {
             
             selected_time = number_input();
             
-            if ((selected_time <= 0) || (selected_time > 120)) {
+            if ((selected_time <= 0) || (selected_time > MAX_PUMP_RUNTIME)) {
                 error_condition = "Invalid time range!";
                 switch_to(error);
             } else {
@@ -354,7 +354,7 @@ void Statemachine::input(int n) {
             
             selected_time = number_input();
             
-            if ((selected_time <= 0) || (selected_time > 120)) {
+            if ((selected_time <= 0) || (selected_time > MAX_VALVE_RUNTIME)) {
                 error_condition = "Invalid time range!";
                 switch_to(error);
             } else {
@@ -436,7 +436,7 @@ void Statemachine::act(void) {
         }
     }
     
-#ifdef CHECK_SENSORS_VALVE_PUMP_MENU
+#ifdef CHECK_SENSORS_VALVE_PUMP_MENU_FULL
     if ((state == menu_pumps_run) || ((state == menu_valves_run) && (selected_id == (plants.countPlants() + 1)))) {
         // check water level state
         auto wl = plants.getWaterlevel();
@@ -451,7 +451,9 @@ void Statemachine::act(void) {
             switch_to(error);
         }
     }
+#endif // CHECK_SENSORS_VALVE_PUMP_MENU_FULL
     
+#ifdef CHECK_SENSORS_VALVE_PUMP_MENU_EMPTY
     if ((state == menu_valves_run) && (selected_id <= plants.countPlants())) {
         // check water level state
         auto wl = plants.getWaterlevel();
@@ -466,7 +468,7 @@ void Statemachine::act(void) {
             switch_to(error);
         }
     }
-#endif
+#endif // CHECK_SENSORS_VALVE_PUMP_MENU_EMPTY
     
     if ((state == auto_fert_run) || (state == auto_tank_run)) {
         unsigned long runtime = millis() - start_time;