added gpio status to websocket and webui

include/Functionality.h

@@ -12,6 +12,8 @@ void ui_run(void);
 
 #ifdef FUNCTION_CONTROL
 
+#include "Plants.h"
+
 void control_setup(void);
 void control_begin(void);
 void control_run(void);
@@ -19,6 +21,8 @@ void control_run(void);
 const char *control_state_name(void);
 void control_act_input(int n);
 
+Plants *get_plants(void);
+
 #endif // FUNCTION_CONTROL
 
 // ----------------------------------------------------------------------------

include/GPIOBank.h

@@ -18,6 +18,8 @@ public:
 private:
     int size;
     int *pins;
+    bool *out_state;
+    bool is_output;
 };
 
 #endif // _GPIO_BANK_H_

include/Plants.h

@@ -37,6 +37,10 @@ public:
     void stopPlant(int id);
     void stopAllPlants(void);
     
+    GPIOBank *getValves(void);
+    GPIOBank *getPumps(void);
+    GPIOBank *getSwitches(void);
+    
 private:
     GPIOBank valves;
     GPIOBank pumps;

include/WifiStuff.h

@@ -7,6 +7,8 @@ void wifi_setup();
 void wifi_run();
 
 void wifi_set_message_buffer(String a, String b, String c, String d);
+void wifi_schedule_websocket(void);
+void wifi_send_websocket(void);
 
 #endif
 

include/config.h

@@ -19,6 +19,7 @@
 
 // all given in milliseconds
 #define SERVER_HANDLE_INTERVAL 10
+#define WEBSOCKET_UPDATE_INTERVAL 500
 #define LED_BLINK_INTERVAL 500
 #define LED_INIT_BLINK_INTERVAL 500
 #define LED_CONNECT_BLINK_INTERVAL 250

include/config_pins.h

@@ -57,14 +57,17 @@
 
 #ifdef FUNCTION_CONTROL
 
+// R1 R2 R3 R4  R5 R6 R7 R8
+//  4  0  2 15  18  5 17 16
+
 #define VALVE_COUNT 5
-#define VALVE_PINS 9, 11, 12, 13, 14
+#define VALVE_PINS 4, 0, 2, 15, 18
 
 #define PUMP_COUNT 3
-#define PUMP_PINS 15, 16, 17
+#define PUMP_PINS 5, 17, 16
 
 #define SWITCH_COUNT 2
-#define SWITCH_PINS 18, 19
+#define SWITCH_PINS 22, 23
 
 #endif // FUNCTION_CONTROL
 

src/Functionality.cpp

@@ -421,6 +421,10 @@ void control_act_input(int n) {
     sm.input(n);
 }
 
+Plants *get_plants(void) {
+    return &plants;
+}
+
 void control_setup(void) {
     plants.setValvePins(valve_pins);
     plants.setPumpPins(pump_pins);
@@ -521,8 +525,10 @@ void write_to_all(const char *a, const char *b,
     Wire.write((int8_t)num_input);
     Wire.endTransmission();
     
-    wifi_set_message_buffer(a, b, c, d);
     write_lcd_to_serial(a, b, c, d);
+    
+    wifi_set_message_buffer(a, b, c, d);
+    wifi_send_websocket();
 }
 
 #endif // ! FUNCTION_UI

src/GPIOBank.cpp

@@ -1,13 +1,21 @@
 #include <Arduino.h>
+
 #include "GPIOBank.h"
 
+#ifdef PLATFORM_ESP
+#include "WifiStuff.h"
+#endif // PLATFORM_ESP
+
 GPIOBank::GPIOBank(int _size) {
     size = _size;
     pins = new int[size];
+    out_state = new bool[size];
+    is_output = false;
 }
 
 GPIOBank::~GPIOBank(void) {
     delete pins;
+    delete out_state;
 }
 
 void GPIOBank::setPinNumbers(int _pins[]) {
@@ -18,8 +26,10 @@ void GPIOBank::setPinNumbers(int _pins[]) {
 
 void GPIOBank::setOutput(void) {
     for (int i = 0; i < size; i++) {
-        pinMode(pins[i], OUTPUT);
+        pinMode(pins[i], INPUT);
+        out_state[i] = true;
     }
+    is_output = true;
 }
 
 void GPIOBank::setInput(bool pullup) {
@@ -30,6 +40,7 @@ void GPIOBank::setInput(bool pullup) {
             pinMode(pins[i], INPUT);
         }
     }
+    is_output = false;
 }
 
 int GPIOBank::getSize(void) {
@@ -37,8 +48,24 @@ int GPIOBank::getSize(void) {
 }
 
 void GPIOBank::setPin(int n, bool state) {
+    if (!is_output) {
+        return;
+    }
+    
     if ((n >= 0) && (n < size)) {
-        digitalWrite(pins[n], state ? HIGH : LOW);
+        //digitalWrite(pins[n], (!state) ? HIGH : LOW);
+        
+        if (state) {
+            pinMode(pins[n], OUTPUT);
+            digitalWrite(pins[n], LOW);
+        } else {
+            pinMode(pins[n], INPUT);
+        }
+        out_state[n] = !state;
+        
+#ifdef PLATFORM_ESP
+        wifi_schedule_websocket();
+#endif // PLATFORM_ESP
     }
 }
 
@@ -50,8 +77,12 @@ void GPIOBank::setAll(bool state) {
 
 bool GPIOBank::getPin(int n) {
     if ((n >= 0) && (n < size)) {
-        return digitalRead(pins[n]);
+        if (is_output) {
+            return !out_state[n];
+        } else {
+            return (!digitalRead(pins[n]));
+        }
     } else {
-        return LOW;
+        return false;
     }
 }

src/Plants.cpp

@@ -8,6 +8,19 @@ Plants::Plants(int valve_count, int pump_count, int switch_count) :
         valves(valve_count), pumps(pump_count), switches(switch_count) {
 }
 
+    
+GPIOBank *Plants::getValves(void) {
+    return &valves;
+}
+
+GPIOBank *Plants::getPumps(void) {
+    return &pumps;
+}
+
+GPIOBank *Plants::getSwitches(void) {
+    return &switches;
+}
+
 void Plants::setValvePins(int pins[]) {
     valves.setPinNumbers(pins);
     valves.setOutput();
@@ -32,8 +45,8 @@ void Plants::abort(void) {
 }
 
 Plants::Waterlevel Plants::getWaterlevel(void) {
-    bool low = !switches.getPin(0);
-    bool high = !switches.getPin(1);
+    bool low = switches.getPin(0);
+    bool high = switches.getPin(1);
     
     if ((!low) && (!high)) {
         return empty;

src/WifiStuff.cpp

@@ -29,6 +29,7 @@ UPDATE_WEB_SERVER server(80);
 WebSocketsServer socket = WebSocketsServer(81);
 SimpleUpdater updater;
 unsigned long last_server_handle_time = 0;
+unsigned long last_websocket_update_time = 0;
 
 String message_buffer_a;
 String message_buffer_b;
@@ -40,6 +41,17 @@ void wifi_set_message_buffer(String a, String b, String c, String d) {
     message_buffer_b = b;
     message_buffer_c = c;
     message_buffer_d = d;
+}
+
+void wifi_schedule_websocket(void) {
+    last_websocket_update_time = 0;
+}
+
+void wifi_send_websocket(void) {
+    String a = message_buffer_a ;
+    String b = message_buffer_b;
+    String c = message_buffer_c;
+    String d = message_buffer_d;
     
     a.replace("\"", "'");
     b.replace("\"", "'");
@@ -47,12 +59,64 @@ void wifi_set_message_buffer(String a, String b, String c, String d) {
     d.replace("\"", "'");
     
     String ws = "{\n";
+    
     ws += "\"a\": \"" + a + "\",\n";
     ws += "\"b\": \"" + b + "\",\n";
     ws += "\"c\": \"" + c + "\",\n";
     ws += "\"d\": \"" + d + "\",\n";
-    ws += "\"state\": \"" + String(control_state_name()) + "\"\n";
+    
+    ws += "\"state\": \"" + String(control_state_name()) + "\",\n";
+    
+    ws += F("\"valves\": [ ");
+    for (int i = 0; i < VALVE_COUNT; i++) {
+        ws += "\"";
+        ws += get_plants()->getValves()->getPin(i) ? "1" : "0";
+        ws += "\"";
+        
+        if (i < (VALVE_COUNT - 1)) {
+            ws += ", ";
+        }
+    }
+    ws += " ],\n";
+    
+    ws += F("\"pumps\": [ ");
+    for (int i = 0; i < PUMP_COUNT; i++) {
+        ws += "\"";
+        ws += get_plants()->getPumps()->getPin(i) ? "1" : "0";
+        ws += "\"";
+        
+        if (i < (PUMP_COUNT - 1)) {
+            ws += ", ";
+        }
+    }
+    ws += " ],\n";
+    
+    ws += F("\"switches\": [ ");
+    for (int i = 0; i < SWITCH_COUNT; i++) {
+        ws += "\"";
+        ws += get_plants()->getSwitches()->getPin(i) ? "1" : "0";
+        ws += "\"";
+        
+        if (i < (SWITCH_COUNT - 1)) {
+            ws += ", ";
+        }
+    }
+    ws += " ],\n";
+    
+    ws += "\"switchstate\": \"";
+    Plants::Waterlevel wl = get_plants()->getWaterlevel();
+    if (wl == Plants::empty) {
+        ws += F("tank empty");
+    } else if (wl == Plants::inbetween) {
+        ws += F("tank half-filled");
+    } else if (wl == Plants::full) {
+        ws += F("tank full");
+    } else {
+        ws += F("invalid sensor state");
+    }
+    ws += "\"\n";
     ws += "}";
+    
     socket.broadcastTXT(ws);
 }
 
@@ -70,18 +134,57 @@ void handleRoot() {
     
     message += F(".ui {\n");
     message += F("width: max-content;\n");
+    message += F("height: max-content;\n");
     message += F("margin-right: 1em;\n");
     message += F("padding: 0 1.0em;\n");
     message += F("border: 1px dashed black;\n");
     message += F("}\n");
     
+    message += F(".io {\n");
+    message += F("width: max-content;\n");
+    message += F("height: max-content;\n");
+    message += F("margin-right: 1em;\n");
+    message += F("padding: 0.8em 1.0em;\n");
+    message += F("border: 1px dashed black;\n");
+    message += F("font-family: monospace;\n");
+    message += F("}\n");
+    
+    message += F(".switch {\n");
+    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("}\n");
+    
+    message += F(".valve {\n");
+    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("}\n");
+    
+    message += F(".pump {\n");
+    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("}\n");
+    
     message += F(".info {\n");
-    message += F("flex-grow: 1;\n");
+    message += F("width: max-content;\n");
+    message += F("height: max-content;\n");
+    message += F("padding: 0 1.0em;\n");
+    message += F("border: 1px dashed black;\n");
+    message += F("font-family: monospace;\n");
     message += F("}\n");
     
     message += F(".pad {\n");
     message += F("background: black;\n");
     message += F("border: 3px solid black;\n");
+    message += F("border-radius: 20px;\n");
     message += F("width: max-content;\n");
     message += F("padding: 1.5em;\n");
     message += F("margin-left: auto;\n");
@@ -90,8 +193,10 @@ void handleRoot() {
     
     message += F(".pad input {\n");
     message += F("background: #fff0cf;\n");
+    message += F("border-radius: 6px;\n");
     message += F("font-weight: bold;\n");
     message += F("font-family: monospace;\n");
+    message += F("font-size: 1.2em;\n");
     message += F("padding: 0.5em 1em;\n");
     message += F("margin: 0.5em;\n");
     message += F("}\n");
@@ -100,7 +205,8 @@ void handleRoot() {
     message += F(".lcd {\n");
     //message += F("background: #9ea18c;\n");
     message += F("background: #9ed18c;\n");
-    message += F("border: 3px solid black;\n");
+    message += F("border: 5px solid black;\n");
+    message += F("border-radius: 10px;\n");
     message += F("width: max-content;\n");
     message += F("padding: 0.65em 1em;\n");
     message += F("box-shadow: inset 0 0 5px 5px rgba(0,0,0,.1);\n");
@@ -111,6 +217,12 @@ void handleRoot() {
     message += F("line-height: 160%;\n");
     message += F("color: #21230e;\n");
     message += F("text-shadow: -1px 2px 1px rgba(0,0,0,.1);\n");
+    message += F("margin-left: auto;\n");
+    message += F("margin-right: auto;\n");
+    message += F("}\n");
+    
+    message += F("#state {\n");
+    message += F("text-align: center;\n");
     message += F("}\n");
     message += F("</style>\n");
     
@@ -149,6 +261,68 @@ void handleRoot() {
     message += control_state_name();
     message += F("</p></div>\n");
     
+    message += F("<div class='io'>\n");
+    message += F("Switches: <span id='switchstate'>");
+    
+    Plants::Waterlevel wl = get_plants()->getWaterlevel();
+    if (wl == Plants::empty) {
+        message += F("tank empty");
+    } else if (wl == Plants::inbetween) {
+        message += F("tank half-filled");
+    } else if (wl == Plants::full) {
+        message += F("tank full");
+    } else {
+        message += F("invalid sensor state");
+    }
+    message += F("</span>");
+    
+    message += F("<div class='container'>\n");
+    for (int i = 0; i < SWITCH_COUNT; i++) {
+        message += F("<div class='switch' style='background-color: ");
+        if (get_plants()->getSwitches()->getPin(i)) {
+            message += F("red");
+        } else {
+            message += F("green");
+        }
+        message += F(";'>S");
+        message += String(i + 1);
+        message += F("</div>");
+    }
+    message += F("</div><hr>\n");
+    
+    message += F("Valves:\n");
+    message += F("<div class='container'>\n");
+    for (int i = 0; i < VALVE_COUNT; i++) {
+        message += F("<div class='valve' style='background-color: ");
+        if (get_plants()->getValves()->getPin(i)) {
+            message += F("red");
+        } else {
+            message += F("green");
+        }
+        message += F(";'>V");
+        message += String(i + 1);
+        message += F("</div>");
+    }
+    message += F("</div><hr>\n");
+    
+    message += F("Pumps:\n");
+    message += F("<div class='container'>\n");
+    for (int i = 0; i < PUMP_COUNT; i++) {
+        message += F("<div class='pump' style='background-color: ");
+        if (get_plants()->getPumps()->getPin(i)) {
+            message += F("red");
+        } else {
+            message += F("green");
+        }
+        message += F(";'>P");
+        message += String(i + 1);
+        message += F("</div>");
+    }
+    message += F("</div><hr>\n");
+    message += F("Green means valve is closed / pump is off / switch is not submersed.\n");
+    message += F("<br>\n");
+    message += F("Red means valve is open / pump is running / switch is submersed.</div>\n");
+    
     message += F("<div class='info'><p>\n");
     message += F("Version: ");
     message += FIRMWARE_VERSION;
@@ -214,6 +388,42 @@ void handleRoot() {
     message += F(    "lcd[0].innerHTML = str;\n");
     message += F(    "var state = document.getElementById('state');\n");
     message += F(    "state.innerHTML = \"State: \" + msg.state;\n");
+    
+    message += F(    "for (let i = 0; i < ");
+    message += String(VALVE_COUNT);
+    message += F("; i++) {\n");
+    message += F(       "var valves = document.getElementsByClassName('valve');\n");
+    message += F(       "if (msg.valves[i] == '0') {\n");
+    message += F(           "valves[i].style = 'background-color: green;';\n");
+    message += F(       "} else {\n");
+    message += F(           "valves[i].style = 'background-color: red;';\n");
+    message += F(       "}\n");
+    message += F(    "}\n");
+    
+    message += F(    "for (let i = 0; i < ");
+    message += String(PUMP_COUNT);
+    message += F("; i++) {\n");
+    message += F(       "var pumps = document.getElementsByClassName('pump');\n");
+    message += F(       "if (msg.pumps[i] == '0') {\n");
+    message += F(           "pumps[i].style = 'background-color: green;';\n");
+    message += F(       "} else {\n");
+    message += F(           "pumps[i].style = 'background-color: red;';\n");
+    message += F(       "}\n");
+    message += F(    "}\n");
+    
+    message += F(    "for (let i = 0; i < ");
+    message += String(SWITCH_COUNT);
+    message += F("; i++) {\n");
+    message += F(       "var switches = document.getElementsByClassName('switch');\n");
+    message += F(       "if (msg.switches[i] == '0') {\n");
+    message += F(           "switches[i].style = 'background-color: green;';\n");
+    message += F(       "} else {\n");
+    message += F(           "switches[i].style = 'background-color: red;';\n");
+    message += F(       "}\n");
+    message += F(    "}\n");
+    
+    message += F(    "var switchstate = document.getElementById('switchstate');\n");
+    message += F(    "switchstate.innerHTML = msg.switchstate;\n");
     message += F("};\n");
     
     message += F("var buttons = document.getElementsByTagName('input');\n");
@@ -325,6 +535,11 @@ void wifi_run() {
 #endif // ARDUINO_ARCH_ESP8266
     }
     
+    if ((millis() - last_websocket_update_time) >= WEBSOCKET_UPDATE_INTERVAL) {
+        last_websocket_update_time = millis();
+        wifi_send_websocket();
+    }
+    
     // reset ESP every 6h to be safe
     if (millis() >= (6 * 60 * 60 * 1000)) {
         ESP.restart();