From 1d0af8bc4221494e82f84248d9a5370bc855b2c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= <git@patrick-hassel.de>
Date: Thu, 11 Apr 2024 14:31:43 +0200
Subject: [PATCH] ESP8266 runnable

---
 lib/patrix/Patrix.cpp |  1 +
 lib/patrix/wifi.cpp   |  8 +++++++-
 platformio.ini        | 33 ++++++++++++++++++++++++---------
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/lib/patrix/Patrix.cpp b/lib/patrix/Patrix.cpp
index 5ec47e7..f913bdc 100644
--- a/lib/patrix/Patrix.cpp
+++ b/lib/patrix/Patrix.cpp
@@ -10,6 +10,7 @@
 void setup() {
   delay(500);
   Serial.begin(115200);
+  Serial.print("\n\n\n");
   info("Startup...");
   configSetup();
   mqttSetup();
diff --git a/lib/patrix/wifi.cpp b/lib/patrix/wifi.cpp
index 5b15769..4a3a76b 100644
--- a/lib/patrix/wifi.cpp
+++ b/lib/patrix/wifi.cpp
@@ -30,6 +30,8 @@ time_t preTimeOffset = 0;
 
 unsigned long wifiLastConnectTry = 0;
 
+bool otaInitialized = false;
+
 void otaSetup();
 
 void bootDelay();
@@ -47,7 +49,10 @@ void wifiConnect() {
   wifiLastConnectTry = millis();
 
   sntp_stop();
-  ArduinoOTA.end();
+  if (otaInitialized) {
+    ArduinoOTA.end();
+    otaInitialized = false;
+  }
   mqttDisconnect();
 
   WiFi.disconnect();
@@ -159,6 +164,7 @@ void wifiLoop() {
       wifiConnected = true;
       info("WiFi connected: ip=%s", WiFi.localIP().toString().c_str());
       ArduinoOTA.begin();
+      otaInitialized = true;
       configTime(TIMEZONE_OFFSET, DST_OFFSET, WiFi.gatewayIP().toString().c_str(), NTP_SERVER);
     } else if (millis() - wifiLastConnectTry > WIFI_TIMEOUT_MS) {
       info("WiFi timeout!");
diff --git a/platformio.ini b/platformio.ini
index 796c2b0..9ed4504 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -16,7 +16,7 @@ lib_deps = milesburton/DallasTemperature
            paulstoffregen/OneWire
            https://github.com/phassel/ArduPID/
 
-[env:DEV]
+[env:TEST32]
 upload_port = 10.42.0.66
 upload_flags = --auth=OtaAuthPatrixDEV
 upload_protocol = ${COMMON.ota_protocol}
@@ -29,19 +29,34 @@ monitor_port = ${COMMON.monitor_port}
 monitor_speed = ${COMMON.monitor_speed}
 monitor_filters = ${COMMON.monitor_filters}
 lib_deps = ${COMMON.lib_deps}
-build_flags = -D HOSTNAME=\"DEV\" -D WIFI_SSID=\"${COMMON.WIFI_SSID}\" -D WIFI_PKEY=\"${COMMON.WIFI_PKEY}\" -D OTA_PASSWORD=\"OtaAuthPatrixDEV\" -D BOOT_DELAY=false -D DEBUG_LOG=false
+build_flags = -D HOSTNAME=\"TEST32\" -D WIFI_SSID=\"${COMMON.WIFI_SSID}\" -D WIFI_PKEY=\"${COMMON.WIFI_PKEY}\" -D OTA_PASSWORD=\"OtaAuthPatrixTEST32\" -D BOOT_DELAY=false -D DEBUG_LOG=false
 
-[env:Fermenter]
-;upload_port = 10.0.0.138
-;upload_flags = --auth=OtaAuthPatrixFermenter
-;upload_protocol = ${COMMON.ota_protocol}
-upload_port = ${COMMON.usb_port}
-upload_speed = ${COMMON.usb_speed}
+[env:TEST8266]
+upload_port = 10.0.0.162
+upload_flags = --auth=OtaAuthPatrixTEST8266
+upload_protocol = ${COMMON.ota_protocol}
+;upload_port = ${COMMON.usb_port}
+;upload_speed = ${COMMON.usb_speed}
 platform = espressif8266
 board = esp12e
 framework = ${COMMON.framework}
 monitor_port = ${COMMON.monitor_port}
 monitor_speed = ${COMMON.monitor_speed}
-monitor_filters = ${COMMON.monitor_filters}
+monitor_filters = esp8266_exception_decoder
+lib_deps = ${COMMON.lib_deps}
+build_flags = -D HOSTNAME=\"TEST8266\" -D WIFI_SSID=\"${COMMON.WIFI_SSID}\" -D WIFI_PKEY=\"${COMMON.WIFI_PKEY}\" -D OTA_PASSWORD=\"OtaAuthPatrixTEST8266\" -D BOOT_DELAY=true -D DEBUG_LOG=true
+
+[env:Fermenter]
+upload_port = 10.0.0.138
+upload_flags = --auth=OtaAuthPatrixFermenter
+upload_protocol = ${COMMON.ota_protocol}
+;upload_port = ${COMMON.usb_port}
+;upload_speed = ${COMMON.usb_speed}
+platform = espressif8266
+board = esp12e
+framework = ${COMMON.framework}
+monitor_port = ${COMMON.monitor_port}
+monitor_speed = ${COMMON.monitor_speed}
+monitor_filters = esp8266_exception_decoder
 lib_deps = ${COMMON.lib_deps}
 build_flags = -D HOSTNAME=\"Fermenter\" -D WIFI_SSID=\"${COMMON.WIFI_SSID}\" -D WIFI_PKEY=\"${COMMON.WIFI_PKEY}\" -D OTA_PASSWORD=\"OtaAuthPatrixFermenter\" -D BOOT_DELAY=true -D DEBUG_LOG=true