New Web UI into master

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/build_and_release.yml

@@ -60,6 +60,6 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           allowUpdates: true
-          artifacts: "firmware/firmware*.bin"
+          artifacts: "firmware/*.bin"
           bodyFile: "CHANGELOG.md"
           removeArtifacts: true

.github/workflows/build_firmware.yml

@@ -41,19 +41,21 @@ jobs:
           python-version: "3.x"
       - name: Install PlatformIO
         run: pip install platformio
+      - name: Build file system image for ${{ inputs.platform }}
+        run: pio run --target buildfs -e ${{ inputs.platform }}
       - name: Build for ${{ inputs.platform }}
         run: pio run -e ${{ inputs.platform }} -t mergebin
       #- name: Display firmware files
       #  run: ls -la .pio/build/${{ inputs.platform }}/firmware*.bin
       - name: Rename and move firmware files
         run: |
+          ls -la .pio/build/${{ inputs.platform }}/*.bin
           mv .pio/build/${{ inputs.platform }}/firmware.bin firmware_${{ inputs.platform }}_ota.bin
-          if [ "${{ inputs.platform }}" != "esp8266dev" ]; then
-            mv .pio/build/${{ inputs.platform }}/firmware_factory.bin firmware_${{ inputs.platform }}_factory.bin
-          fi
-          ls -la firmware*.bin
+          mv .pio/build/${{ inputs.platform }}/firmware_factory.bin firmware_${{ inputs.platform }}_factory.bin
+          mv .pio/build/${{ inputs.platform }}/spiffs.bin spiffs_${{ inputs.platform }}.bin
+          ls -la *.bin
       - name: Archive Firmware
         uses: actions/upload-artifact@v4
         with:
           name: firmware_${{ inputs.platform }}
-          path: firmware_${{ inputs.platform }}*.bin
+          path: "*_${{ inputs.platform }}*.bin"

.gitignore

@@ -4,3 +4,4 @@
 .vscode/launch.json
 .vscode/ipch
 .vscode/extensions.json
+.DS_Store

CHANGELOG.md

@@ -1,5 +1,6 @@
-**Prereq for New Web UI**
+**New Web UI**
 
-* Move settings to Preferences
-* Updated OTA to support flashing file system
-* Bug fixes
+***Breaking change*** *You should deploy v1.0.9 if migrating from an ealier version, this will ensure your settings (mqtt server, spa name, etc) are migrated.*
+
+* Changed settings to be stored in Preferences
+* New Web UI

README.md

@@ -1,30 +1,7 @@
-# SpaNet MQTT ESP32 bridge
+# eSpa
 
-SpaNet serial to mqtt bridge, including HomeAssitant autodiscovery.
+## Introduction
 
-Developed for the ESP32 Dev board but should work on any ESP32 platform. By default uses UART2 for communications with the SpaNet controller.
-
-Discussion on this (and other) SpaNet projects can be found here https://discord.com/channels/967940763595980900/967940763595980903
-
-## Configuration
-On first boot or whenever the enable key is press the board will enter hotspot mode.  Connect to the hotspot to configure wifi & mqtt settings.  
-
-## Firmware updates
-
-Firmware updates can be pushed to http://ipaddress/fota
-
-## Logging
-
-Debug / log functionality is available by telneting to the device's ip address
-
-
-## Circuit
-To keep things as simple as possible, off the shelf modules have been used.  
-NOTE: The resistors on the RX/TX pins are recommended but optional.  
-
-<img src="circuit/circuit.png" alt="Circuit" title="Circuit"/>  
-
-<img src="images/board.png" alt="Assembly" title="Assembly" width="33%"/>
-<img src="images/disassembled.png" alt="Components" title="Components" width="33%"/>
-<img src="images/wiring.png" alt="Wiring" title="Wiring" width="33%"/>
+The [eSpa project](https://espa.diy) is an open source community for spa home automation, built around [firmware](https://espa.diy/firmware.html) (found in this GitHub repo) and a simple [hardware design](https://espa.diy/hardware.html) that you can build yourself, or [purchase pre-assembled](https://store.espa.diy/).
 
+Learn more at the [eSpa website](https://espa.diy), and [join us on Discord](https://discord.gg/faK8Ag4wHn).