added ability to water multiple plants at once

include/BoolField.h

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2021 Thomas Buck <thomas@xythobuz.de>
+ *
+ * This file is part of Giess-o-mat.
+ *
+ * Giess-o-mat is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Giess-o-mat is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Giess-o-mat.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef _BOOL_FIELD_H_
+#define _BOOL_FIELD_H_
+
+class BoolField {
+public:
+    BoolField(int size_);
+    ~BoolField(void);
+    
+    void clear(void);
+    void set(int n);
+    bool isSet(int n);
+    
+private:
+    int size;
+    bool *field;
+};
+
+#endif // _BOOL_FIELD_H_

include/Statemachine.h

@@ -21,6 +21,7 @@
 #define _STATEMACHINE_H_
 
 #include <Arduino.h>
+#include "BoolField.h"
 
 #define stringify( name ) # name
 
@@ -95,6 +96,7 @@ private:
     print_fn print;
     backspace_fn backspace;
     
+    BoolField selected_plants;
     uint32_t selected_id; // pump or valve id
     uint32_t selected_time; // runtime
     unsigned long start_time, stop_time, last_animation_time;

src/BoolField.cpp

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2021 Thomas Buck <thomas@xythobuz.de>
+ *
+ * This file is part of Giess-o-mat.
+ *
+ * Giess-o-mat is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Giess-o-mat is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Giess-o-mat.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "BoolField.h"
+
+BoolField::BoolField(int size_) {
+    size = size_;
+    field = new bool[size];
+}
+
+BoolField::~BoolField(void) {
+    delete field;
+}
+
+void BoolField::clear(void) {
+    for (int i = 0; i < size; i++) {
+        field[i] = false;
+    }
+}
+
+void BoolField::set(int n) {
+    field[n] = true;
+}
+
+bool BoolField::isSet(int n) {
+    return field[n];
+}

src/Statemachine.cpp

@@ -99,7 +99,7 @@ const char *Statemachine::getStateName(void) {
 }
 
 Statemachine::Statemachine(print_fn _print, backspace_fn _backspace)
-        : db(7) {
+        : db(7), selected_plants(plants.countPlants()) {
     state = init;
     old_state = init;
     print = _print;
@@ -150,6 +150,7 @@ void Statemachine::input(int n) {
                 switch_to(error);
             }
         } else if (n == 3) {
+            selected_plants.clear();
             switch_to(auto_plant);
         } else if ((n == -1) || (n == -2)) {
             switch_to(menu);
@@ -192,18 +193,15 @@ void Statemachine::input(int n) {
             }
         } else if (n == -2) {
             if (!db.hasDigits()) {
-                return;
-            }
-            
-            selected_id = number_input();
-            
-            if ((selected_id <= 0) || (selected_id > plants.countPlants())) {
-                error_condition = "Invalid plant ID!";
-                switch_to(error);
-            } else {
                 auto wl = plants.getWaterlevel();
                 if ((wl != Plants::empty) && (wl != Plants::invalid)) {
-                    plants.startPlant(selected_id - 1);
+                    for (int i = 0; i < plants.countPlants(); i++) {
+                        if (selected_plants.isSet(i)) {
+                            plants.startPlant(i);
+                        }
+                    }
+                    selected_plants.clear();
+                    
                     selected_time = MAX_AUTO_PLANT_RUNTIME;
                     start_time = millis();
                     switch_to(auto_plant_run);
@@ -215,6 +213,15 @@ void Statemachine::input(int n) {
                     state = auto_mode;
                     switch_to(error);
                 }
+            } else {
+                selected_id = number_input();
+                if ((selected_id <= 0) || (selected_id > plants.countPlants())) {
+                    error_condition = "Invalid plant ID!";
+                    switch_to(error);
+                } else {
+                    selected_plants.set(selected_id - 1);
+                    switch_to(auto_plant);
+                }
             }
         } else {
             if (db.spaceLeft()) {
@@ -589,7 +596,7 @@ void Statemachine::switch_to(States s) {
         String a = String("(Input 1 to ") + String(plants.countPlants()) + String(")");
         
         print("--- Select Plant ---",
-              "Which plant to water",
+              "Leave empty if done!",
               a.c_str(),
               "Plant: ",
               3);