Added optional GPIO test and fixed pin numbering

include/config_pins.h

@@ -25,12 +25,15 @@
 
 #ifdef FUNCTION_CONTROL
 
+// out 1, out 2, out 3, out 4, in
 #define VALVE_COUNT 5
 #define VALVE_PINS 10, 11, 12, 14, 15
 
+// a, b, c
 #define PUMP_COUNT 3
 #define PUMP_PINS 16, 17, 18
 
+// bottom, top
 #define SWITCH_COUNT 2
 #define SWITCH_PINS 19, 20
 
@@ -57,17 +60,17 @@
 
 #ifdef FUNCTION_CONTROL
 
-// R1 R2 R3 R4  R5 R6 R7 R8
-//  4  0  2 15  18  5 17 16
-
+// out 1, out 2, out 3, out 4, in
 #define VALVE_COUNT 5
-#define VALVE_PINS 4, 0, 2, 15, 18
+#define VALVE_PINS 27, 14, 5, 18, 15
 
+// a, b, c
 #define PUMP_COUNT 3
-#define PUMP_PINS 5, 17, 16
+#define PUMP_PINS 2, 0, 4
 
+// bottom, top
 #define SWITCH_COUNT 2
-#define SWITCH_PINS 22, 23
+#define SWITCH_PINS 26, 25
 
 #define I2C_SDA_PIN 21
 #define I2C_SCL_PIN 22

src/WifiStuff.cpp

@@ -37,6 +37,45 @@ String message_buffer_b;
 String message_buffer_c;
 String message_buffer_d;
 
+//#define ENABLE_GPIO_TEST
+#ifdef ENABLE_GPIO_TEST
+
+#define GPIO_TEST_INTERVAL 4000
+#define GPIO_TEST_DELAY 200
+static bool runningGpioTest = false;
+static bool gpioTestState = false;
+unsigned long lastGpioTime = 0;
+
+void runGpioTest(bool state) {
+    lastGpioTime = millis();
+    
+    for (int i = 0; i < VALVE_COUNT; i++) {
+        get_plants()->getValves()->setPin(i, state);
+        delay(GPIO_TEST_DELAY);
+    }
+    
+    for (int i = 0; i < PUMP_COUNT; i++) {
+        get_plants()->getPumps()->setPin(i, state);
+        if (i < (PUMP_COUNT - 1)) {
+            delay(GPIO_TEST_DELAY);
+        }
+    }
+}
+
+void handleGpioTest() {
+    runningGpioTest = !runningGpioTest;
+    gpioTestState = runningGpioTest;
+    
+    String message = F("GPIOs turned ");
+    message += runningGpioTest ? "on" : "off";
+
+    server.send(200, "text/html", message);
+    
+    runGpioTest(gpioTestState);
+}
+
+#endif // ENABLE_GPIO_TEST
+
 void wifi_set_message_buffer(String a, String b, String c, String d) {
     message_buffer_a = a;
     message_buffer_b = b;
@@ -433,6 +472,11 @@ void handleRoot() {
     message += F("<p>Try <a href='/update'>/update</a> for OTA firmware updates!</p>\n");
     message += F("<p>Made by <a href='https://xythobuz.de'>xythobuz</a></p>\n");
     message += F("<p><a href='https://git.xythobuz.de/thomas/giess-o-mat'>Project Repository</a></p>\n");
+    
+#ifdef ENABLE_GPIO_TEST
+    message += F("<p><a href='/gpiotest'>GPIO Test</a></p>\n");
+#endif // ENABLE_GPIO_TEST
+    
     message += F("</div></div>\n");
     
     message += F("<div class='log'><pre id='logbuf'>\n");
@@ -589,6 +633,11 @@ void wifi_setup() {
     MDNS.begin(hostname.c_str());
     updater.setup(&server);
     server.on("/", handleRoot);
+    
+#ifdef ENABLE_GPIO_TEST
+    server.on("/gpiotest", handleGpioTest);
+#endif // ENABLE_GPIO_TEST
+    
     server.begin();
     MDNS.addService("http", "tcp", 80);
     
@@ -618,6 +667,13 @@ void wifi_run() {
     if (millis() >= (6 * 60 * 60 * 1000)) {
         ESP.restart();
     }
+    
+#ifdef ENABLE_GPIO_TEST
+    if (runningGpioTest && ((millis() - lastGpioTime) >= GPIO_TEST_INTERVAL)) {
+        gpioTestState = !gpioTestState;
+        runGpioTest(gpioTestState);
+    }
+#endif // ENABLE_GPIO_TEST
 }
 
 #endif // PLATFORM_ESP