Fist version actually running on ESP, now with working WiFi stuff

include/WifiStuff.h

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

include/config.h

@@ -25,6 +25,7 @@
 #define LED_ERROR_BLINK_INTERVAL 100
 
 #define OWN_I2C_ADDRESS 0x42
+#define I2C_BUS_SPEED 400000
 #define I2C_BUF_SIZE 32
 
 #endif // _CONFIG_H_

include/config_pins.h

@@ -57,8 +57,6 @@
 
 #ifdef FUNCTION_CONTROL
 
-#ifdef FUNCTION_UI
-
 #define VALVE_COUNT 5
 #define VALVE_PINS 9, 11, 12, 13, 14
 
@@ -68,19 +66,6 @@
 #define SWITCH_COUNT 2
 #define SWITCH_PINS 18, 19
 
-#else
-
-#define VALVE_COUNT 5
-#define VALVE_PINS 9, 11, 12, 13, 14
-
-#define PUMP_COUNT 3
-#define PUMP_PINS 15, 16, 17
-
-#define SWITCH_COUNT 2
-#define SWITCH_PINS 18, 19
-
-#endif
-
 #endif // FUNCTION_CONTROL
 
 #endif // PLATFORM_ESP

src/Functionality.cpp

@@ -38,6 +38,7 @@ bool doing_multi_input = false;
 
 #include "Plants.h"
 #include "Statemachine.h"
+#include "WifiStuff.h"
 
 Plants plants(VALVE_COUNT, PUMP_COUNT, SWITCH_COUNT);
 int valve_pins[VALVE_COUNT] = { VALVE_PINS };
@@ -50,6 +51,144 @@ Statemachine sm(write_to_all, backspace);
 
 // ----------------------------------------------------------------------------
 
+void write_lcd_to_serial(const char *a, const char *b,
+                  const char *c, const char *d) {
+#ifdef DEBUG_ENABLE_LCD_OUTPUT_ON_SERIAL
+    int la = strlen(a);
+    int lb = strlen(b);
+    int lc = strlen(c);
+    int ld = strlen(d);
+    
+    Serial.println();
+    Serial.println(" ----------------------");
+    
+    Serial.print("| ");
+    Serial.print(a);
+    if (la < 20) {
+        for (int i = 0; i < (20 - la); i++) {
+            Serial.print(' ');
+        }
+    }
+    Serial.println(" |");
+    
+    Serial.print("| ");
+    Serial.print(b);
+    if (lb < 20) {
+        for (int i = 0; i < (20 - lb); i++) {
+            Serial.print(' ');
+        }
+    }
+    Serial.println(" |");
+    
+    Serial.print("| ");
+    Serial.print(c);
+    if (lc < 20) {
+        for (int i = 0; i < (20 - lc); i++) {
+            Serial.print(' ');
+        }
+    }
+    Serial.println(" |");
+    
+    Serial.print("| ");
+    Serial.print(d);
+    if (ld < 20) {
+        for (int i = 0; i < (20 - ld); i++) {
+            Serial.print(' ');
+        }
+    }
+    Serial.println(" |");
+    
+    Serial.println(" ----------------------");
+    Serial.println("Please provide keypad input:");
+#endif // DEBUG_ENABLE_LCD_OUTPUT_ON_SERIAL
+}
+
+void handle_input(int n) {
+#ifdef FUNCTION_CONTROL
+    
+    sm.input(n);
+    
+#else
+    
+    keybuffer.push(n);
+    
+#endif // FUNCTION_CONTROL
+}
+
+void input_serial(void) {
+#ifdef DEBUG_ENABLE_KEYPAD_INPUT_ON_SERIAL
+    if (Serial.available() > 0) {
+        
+#ifdef FUNCTION_UI
+        last_input_time = millis();
+        if (!backlight_state) {
+            backlight_state = true;
+            lcd.setBacklight(255);
+        }
+#endif // FUNCTION_UI
+        
+        int c = Serial.read();
+        if (c == '*') {
+            Serial.write(c);
+            Serial.write('\n');
+            
+#ifdef FUNCTION_UI
+            if (doing_multi_input) {
+                char s[2] = { (char)(c), '\0' };
+                lcd.write(s);
+            }
+#endif // FUNCTION_UI
+            
+            handle_input(-1);
+        } else if  (c == '#') {
+            Serial.write(c);
+            Serial.write('\n');
+            
+#ifdef FUNCTION_UI
+            if (doing_multi_input) {
+                char s[2] = { (char)(c), '\0' };
+                lcd.write(s);
+            }
+#endif // FUNCTION_UI
+            
+            handle_input(-2);
+        } else if  (c == '\n') {
+            Serial.write('#');
+            Serial.write('\n');
+            
+#ifdef FUNCTION_UI
+            if (doing_multi_input) {
+                char s[2] = { '#', '\0' };
+                lcd.write(s);
+            }
+#endif // FUNCTION_UI
+            
+            handle_input(-2);
+        } else if (c == '\b') {
+            Serial.write(c);
+            handle_input(-1);
+        } else if ((c >= '0') && (c <= '9')) {
+            Serial.write(c);
+            
+#ifdef FUNCTION_UI
+            if (!doing_multi_input) {
+                Serial.write('\n');
+            }
+            
+            if (doing_multi_input) {
+                char s[2] = { (char)(c), '\0' };
+                lcd.write(s);
+            }
+#endif // FUNCTION_UI
+            
+            handle_input(c - '0');
+        }
+    }
+#endif // DEBUG_ENABLE_KEYPAD_INPUT_ON_SERIAL
+}
+
+// ----------------------------------------------------------------------------
+
 #ifdef FUNCTION_UI
 
 #ifndef FUNCTION_CONTROL
@@ -176,18 +315,6 @@ void ui_setup(void) {
 #endif // ! FUNCTION_CONTROL
 }
 
-void handle_input(int n) {
-#ifdef FUNCTION_CONTROL
-    
-    sm.input(n);
-    
-#else
-    
-    keybuffer.push(n);
-    
-#endif // FUNCTION_CONTROL
-}
-
 void input_keypad(void) {
     keys.scan();
     while (keys.hasEvent()) {
@@ -224,66 +351,6 @@ void input_keypad(void) {
     }
 }
 
-void input_serial(void) {
-#ifdef DEBUG_ENABLE_KEYPAD_INPUT_ON_SERIAL
-    if (Serial.available() > 0) {
-        last_input_time = millis();
-        if (!backlight_state) {
-            backlight_state = true;
-            lcd.setBacklight(255);
-        }
-        
-        int c = Serial.read();
-        if (c == '*') {
-            Serial.write(c);
-            Serial.write('\n');
-            
-            if (doing_multi_input) {
-                char s[2] = { (char)(c), '\0' };
-                lcd.write(s);
-            }
-            
-            handle_input(-1);
-        } else if  (c == '#') {
-            Serial.write(c);
-            Serial.write('\n');
-            
-            if (doing_multi_input) {
-                char s[2] = { (char)(c), '\0' };
-                lcd.write(s);
-            }
-            
-            handle_input(-2);
-        } else if  (c == '\n') {
-            Serial.write('#');
-            Serial.write('\n');
-            
-            if (doing_multi_input) {
-                char s[2] = { '#', '\0' };
-                lcd.write(s);
-            }
-            
-            handle_input(-2);
-        } else if (c == '\b') {
-            Serial.write(c);
-            handle_input(-1);
-        } else if ((c >= '0') && (c <= '9')) {
-            Serial.write(c);
-            if (!doing_multi_input) {
-                Serial.write('\n');
-            }
-            
-            if (doing_multi_input) {
-                char s[2] = { (char)(c), '\0' };
-                lcd.write(s);
-            }
-            
-            handle_input(c - '0');
-        }
-    }
-#endif // DEBUG_ENABLE_KEYPAD_INPUT_ON_SERIAL
-}
-
 void ui_run(void) {
     input_keypad();
     input_serial();
@@ -322,54 +389,7 @@ void write_to_all(const char *a, const char *b,
         doing_multi_input = false;
     }
     
-#ifdef DEBUG_ENABLE_LCD_OUTPUT_ON_SERIAL
-    int la = strlen(a);
-    int lb = strlen(b);
-    int lc = strlen(c);
-    int ld = strlen(d);
-    
-    Serial.println();
-    Serial.println(" ----------------------");
-    
-    Serial.print("| ");
-    Serial.print(a);
-    if (la < 20) {
-        for (int i = 0; i < (20 - la); i++) {
-            Serial.print(' ');
-        }
-    }
-    Serial.println(" |");
-    
-    Serial.print("| ");
-    Serial.print(b);
-    if (lb < 20) {
-        for (int i = 0; i < (20 - lb); i++) {
-            Serial.print(' ');
-        }
-    }
-    Serial.println(" |");
-    
-    Serial.print("| ");
-    Serial.print(c);
-    if (lc < 20) {
-        for (int i = 0; i < (20 - lc); i++) {
-            Serial.print(' ');
-        }
-    }
-    Serial.println(" |");
-    
-    Serial.print("| ");
-    Serial.print(d);
-    if (ld < 20) {
-        for (int i = 0; i < (20 - ld); i++) {
-            Serial.print(' ');
-        }
-    }
-    Serial.println(" |");
-    
-    Serial.println(" ----------------------");
-    Serial.println("Please provide keypad input:");
-#endif // DEBUG_ENABLE_LCD_OUTPUT_ON_SERIAL
+    write_lcd_to_serial(a, b, c, d);
 }
 
 void backspace(void) {
@@ -401,9 +421,11 @@ void control_setup(void) {
 #ifndef FUNCTION_UI
     
     Serial.println("Initializing I2C Master");
+    Wire.setClock(I2C_BUS_SPEED);
     Wire.begin();
     
 #ifdef DEBUG_WAIT_FOR_SERIAL_CONN
+    Serial.println("Wait for Serial");
     while (!Serial);
 #endif // DEBUG_WAIT_FOR_SERIAL_CONN
     
@@ -436,6 +458,8 @@ void control_run(void) {
             sm.input(c);
         }
     }
+    
+    input_serial();
 
 #endif // ! FUNCTION_UI
     
@@ -488,6 +512,9 @@ void write_to_all(const char *a, const char *b,
     Wire.write(0x04); // display command
     Wire.write((int8_t)num_input);
     Wire.endTransmission();
+    
+    wifi_set_message_buffer(a, b, c, d);
+    write_lcd_to_serial(a, b, c, d);
 }
 
 #endif // ! FUNCTION_UI

src/WifiStuff.cpp

@@ -45,11 +45,38 @@ void handleRoot() {
     message += F("<h1>Giess-o-mat</h1>\n");
     
     message += F("\n<pre>\n");
-    message += message_buffer_a + '\n';
-    message += message_buffer_b + '\n';
-    message += message_buffer_c + '\n';
-    message += message_buffer_d + '\n';
-    message += F("\n</pre>\n");
+    message += F(" ----------------------\n");
+    
+    message += F("| ");
+    message += message_buffer_a;
+    for (int i = 0; i < (20 - message_buffer_a.length()); i++) {
+        message += ' ';
+    }
+    message += F(" |\n");
+    
+    message += F("| ");
+    message += message_buffer_b;
+    for (int i = 0; i < (20 - message_buffer_b.length()); i++) {
+        message += ' ';
+    }
+    message += F(" |\n");
+    
+    message += F("| ");
+    message += message_buffer_c;
+    for (int i = 0; i < (20 - message_buffer_c.length()); i++) {
+        message += ' ';
+    }
+    message += F(" |\n");
+    
+    message += F("| ");
+    message += message_buffer_d;
+    for (int i = 0; i < (20 - message_buffer_d.length()); i++) {
+        message += ' ';
+    }
+    message += F(" |\n");
+    
+    message += F(" ----------------------\n");
+    message += F("</pre>\n");
     
     message += F("\n<p>\n");
     message += F("State: ");
@@ -121,22 +148,29 @@ void wifi_setup() {
 #if defined(ARDUINO_ARCH_ESP8266)
 
     // Connect to WiFi AP
+    Serial.println("WiFi: initializing");
     WiFi.hostname(hostname);
     WiFi.mode(WIFI_STA);
+    
+    Serial.print("WiFi: connecting");
     WiFi.begin(WIFI_SSID, WIFI_PW);
     while (WiFi.status() != WL_CONNECTED) {
+        Serial.print(".");
         delay(LED_CONNECT_BLINK_INTERVAL);
         digitalWrite(BUILTIN_LED_PIN, !digitalRead(BUILTIN_LED_PIN));
     }
+    Serial.println();
     
 #elif defined(ARDUINO_ARCH_ESP32)
 
     // Set hostname workaround
+    Serial.println("WiFi: set hostname");
     WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE);
     WiFi.setHostname(hostname.c_str());
     
     // Workaround for WiFi connecting only every 2nd reset
     // https://github.com/espressif/arduino-esp32/issues/2501#issuecomment-513602522
+    Serial.println("WiFi: connection work-around");
     WiFi.onEvent([](WiFiEvent_t event, WiFiEventInfo_t info) {
         if (info.disconnected.reason == 202) {
             esp_sleep_enable_timer_wakeup(10);
@@ -146,24 +180,32 @@ void wifi_setup() {
     }, WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED);
 
     // Connect to WiFi AP
+    Serial.println("WiFi: SSID=" WIFI_SSID);
+    Serial.print("WiFi: connecting");
     WiFi.mode(WIFI_STA);
     WiFi.begin(WIFI_SSID, WIFI_PW);
     while (WiFi.status() != WL_CONNECTED) {
+        Serial.print(".");
         delay(LED_CONNECT_BLINK_INTERVAL);
         digitalWrite(BUILTIN_LED_PIN, !digitalRead(BUILTIN_LED_PIN));
     }
+    Serial.println();
     
     // Set hostname workaround
+    Serial.println("WiFi: set hostname work-around");
     WiFi.setHostname(hostname.c_str());
 
 #endif
 
     // Setup HTTP Server
+    Serial.println("WiFi: initializing HTTP server");
     MDNS.begin(hostname.c_str());
     updater.setup(&server);
     server.on("/", handleRoot);
     server.begin();
     MDNS.addService("http", "tcp", 80);
+    
+    Serial.println("WiFi: setup done");
 }
 
 void wifi_run() {

src/main.cpp

@@ -16,14 +16,17 @@ void setup() {
     Serial.println("Version: " FIRMWARE_VERSION);
 
 #ifdef FUNCTION_UI
+    Serial.println("Initializing UI");
     ui_setup();
 #endif // FUNCTION_UI
     
 #ifdef FUNCTION_CONTROL
+    Serial.println("Initializing Control");
     control_setup();
 #endif // FUNCTION_CONTROL
     
 #ifdef PLATFORM_ESP
+    Serial.println("Initializing WiFi");
     wifi_setup();
 #endif // PLATFORM_ESP
     
@@ -34,9 +37,11 @@ void setup() {
     
 #ifndef FUNCTION_UI
     // give ui unit some time to initialize
+    Serial.println("Waiting for UI to boot");
     delay(3000);
 #endif // ! FUNCTION_UI
     
+    Serial.println("Starting state machine");
     control_begin();
     
 #endif // FUNCTION_CONTROL