version 0.9.5 (#37)

* Have "pio run" build the svelte interface.
* Use og3 0.4.0, packages Watchdog

Author: chl33

README.md

@@ -33,19 +33,10 @@ Please see the [instructions](instructions.md) for how to assemble and set up a
 *   [PlatformIO](https://platformio.org/) (Core or VSCode extension)
 *   [Node.js](https://nodejs.org/) (for building the web interface)
 
-### Building the Web Interface
-The web interface is built with Svelte and must be compiled before uploading to the ESP32's filesystem.
-
-```bash
-./build-svelte.sh
-```
-
-This generates the static HTML/CSS/JS files in `data/static/`, then converts them into a header file (using [svelteesp32](https://github.com/BCsabaEngine/svelteesp32))to include them all in the firmware.
-
 ### Building and Flashing Firmware
 
 1.  **Configure Secrets**: Copy `secrets.ini.example` to `secrets.ini` and set your WiFi credentials, OTA password, and MQTT details.
-2.  **Build Firmware**:
+2.  **Build the Web interface and Firmware**:
     ```bash
     pio run
     ```

build_svelte.py

@@ -0,0 +1,31 @@
+import os
+import subprocess
+from SCons.Script import Import
+
+# Import the build environment from PlatformIO/SCons
+Import("env")
+
+def build_svelte():
+    print("Building Svelte interface...")
+    
+    # Get the project root directory
+    project_dir = env.subst("$PROJECT_DIR")
+    script_path = os.path.join(project_dir, "build-svelte.sh")
+    
+    # Ensure the script is executable
+    # This enables the OS to run it directly via the shebang (#!/bin/sh)
+    os.chmod(script_path, 0o755)
+    
+    # Execute the shell script directly (shell=False)
+    # We pass the full path as the executable.
+    try:
+        subprocess.run([script_path], cwd=project_dir, check=True)
+    except subprocess.CalledProcessError:
+        print("Error: Svelte build script returned non-zero exit code!")
+        env.Exit(1)
+    except OSError as e:
+        print(f"Error: Could not execute build script at {script_path}")
+        print(f"Details: {e}")
+        env.Exit(1)
+
+build_svelte()

platformio.ini

@@ -23,9 +23,10 @@ monitor_speed = 115200
 check_tool = clangtidy
 monitor_filters = esp32_exception_decoder
 build_type = release
+extra_scripts = pre:build_svelte.py
 lib_deps =
 ;        watering
-	chl33/og3@^0.3.99
+	chl33/og3@^0.4.0
 	og3x-oled@^0.3.1
 	og3x-shtc3@^0.3.0
 	adafruit/Adafruit BusIO
@@ -54,5 +55,5 @@ upload_port = ${secrets.uploadPort}
 upload_flags =
 	${secrets.uploadAuth}
 	${secrets.uploadHostPort}
-lib_ldf_mode = deep
+lib_ldf_mode = chain
 lib_compat_mode = strict

src/main.cpp

@@ -6,14 +6,14 @@
 #include <AsyncJson.h>
 #include <ESPAsyncWebServer.h>
 #include <LittleFS.h>
-#include <esp_task_wdt.h>
 #include <og3/constants.h>
 #include <og3/ha_app.h>
 #include <og3/html_table.h>
 #include <og3/oled_wifi_info.h>
 #include <og3/shtc3.h>
 #include <og3/units.h>
 #include <og3/variable.h>
+#include <og3/wifi_watchdog.h>
 
 #include <algorithm>
 #include <array>
@@ -24,7 +24,7 @@
 #include "svelteesp32async.h"
 #include "watering.h"
 
-#define SW_VERSION "0.9.4"
+#define SW_VERSION "0.9.5"
 
 namespace {
 
@@ -91,6 +91,8 @@ og3::PeriodicTaskScheduler climate_scheduler(
     },
     &s_app.tasks());
 
+og3::WifiWatchdog s_watchdog(&s_app, std::chrono::seconds(5), std::chrono::seconds(1));
+
 // s_reservior monitors the water level of the reservoir: the float, and the number of seconds
 //  the pumps have run since the float detected low water level.
 og3::ReservoirCheck s_reservoir(kWaterPin, &s_app);
@@ -473,19 +475,7 @@ void setup() {
 
   // Run the og3 application setup code.
   s_app.setup();
-
-  // Initialize Watchdog Timer with 5 second timeout
-  esp_task_wdt_init(5, true);
-  esp_task_wdt_add(NULL);  // Add current thread (loopTask) to WDT
-
-  // Disable WDT during OTA
-  ArduinoOTA.onStart([]() { esp_task_wdt_delete(NULL); });
-  ArduinoOTA.onEnd([]() { esp_task_wdt_add(NULL); });
-  ArduinoOTA.onError([](ota_error_t error) { esp_task_wdt_add(NULL); });
 }
 
 // This is called repeaedly when code is running.
-void loop() {
-  s_app.loop();
-  esp_task_wdt_reset();  // Reset watchdog timer
-}
+void loop() { s_app.loop(); }