Merge pull request #501 from IgorYbema/merge-with-egyras

v3.5 release
Egyras · Aug 14, 2024 · 6a32003 · 6a32003
2 parents eeea578 + 24677ab
commit 6a32003
Show file tree

Hide file tree

Showing 121 changed files with 329,253 additions and 8,442 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -3,16 +3,16 @@ name: Build binary
 on: [push, pull_request]
 
 env:
-  ARDUINO_BOARD_MANAGER_ADDITIONAL_URLS: http://arduino.esp8266.com/stable/package_esp8266com_index.json
+  ARDUINO_BOARD_MANAGER_ADDITIONAL_URLS: "http://arduino.esp8266.com/stable/package_esp8266com_index.json https://espressif.github.io/arduino-esp32/package_esp32_dev_index.json"
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      
+
       - name: Update version.h
         if: github.ref != 'refs/heads/main' #do not change version in main branch run
         run: cd HeishaMon && echo "static const char *heishamon_version = \"Alpha-$(git rev-parse --short HEAD)\";" > version.h && cat version.h
@@ -25,19 +25,33 @@ jobs:
         run:  |
           arduino-cli core update-index
           arduino-cli core install esp8266:esp8266
+          arduino-cli core install esp32:esp32
 
       - name: Install dependencies
-        run:  arduino-cli lib install ringbuffer pubsubclient doubleresetdetect arduinojson dallastemperature onewire WebSockets
+        run:  arduino-cli lib install ringbuffer pubsubclient arduinojson dallastemperature onewire WebSockets "Adafruit NeoPixel"
+
+      - name: Fix Onewire lib for ESP32-3.0.0
+        run: |
+          sed -i '/#include <driver\/rtc_io\.h>/a\
+          #include <soc\/gpio_struct\.h>' \
+          /home/runner/Arduino/libraries/OneWire/util/OneWire_direct_gpio.h
 
-      - name: Compile Sketch
-        run: cd HeishaMon && arduino-cli compile --output-dir . --fqbn=esp8266:esp8266:d1_mini:xtal=160,vt=flash,ssl=basic,mmu=3216,non32xfer=safe,eesz=4M2M,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=921600 --warnings=none --verbose HeishaMon.ino
+      - name: Compile Sketch for ESP8266
+        run: cd HeishaMon && arduino-cli compile --output-dir . --fqbn=esp8266:esp8266:d1_mini:xtal=160,vt=flash,ssl=basic,mmu=3216,non32xfer=fast,eesz=4M2M,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=921600 --warnings=none --verbose HeishaMon.ino
 
-      - name: Add MD5 checksum
-        run: cd HeishaMon && MD5=`md5sum HeishaMon.ino.bin | cut -d\  -f1` && mv HeishaMon.ino.bin HeishaMon-alpha-$MD5.bin
+      - name: Add MD5 checksum to ESP8266 binary
+        run: cd HeishaMon && MD5=`md5sum HeishaMon.ino.bin | cut -d\  -f1` && mv HeishaMon.ino.bin HeishaMon_ESP8266-alpha-$MD5.bin
         shell: bash
 
+      - name: Compile Sketch for ESP32
+        run: cd HeishaMon && arduino-cli compile --output-dir . --fqbn=esp32:esp32:esp32s3:CDCOnBoot=cdc,PSRAM=enabled,PartitionScheme=min_spiffs  --warnings=none --verbose HeishaMon.ino
+
+      - name: Add MD5 checksum to ESP32 binary
+        run: cd HeishaMon && MD5=`md5sum HeishaMon.ino.bin | cut -d\  -f1` && mv HeishaMon.ino.bin HeishaMon_ESP32-alpha-$MD5.bin
+        shell: bash        
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
         with:
           name: HeishaMon.ino.bin
-          path: HeishaMon/HeishaMon-*.bin
+          path: HeishaMon/HeishaMon_*.bin
diff --git a/HeatPumpType.md b/HeatPumpType.md
@@ -42,12 +42,13 @@ Assuming that bytes from #129 to #138 are unique for each model of Aquarea heat
 |35 | E2 CF 0D 85 05 12 D0 0E 94 05 | WH-SXC09H3E8 | WH-UX09HE8 | KIT-WXC09H3E8 | 9 | 3ph | T-CAP - new version |
 |36 | E2 D5 0D 36 99 02 D6 0F 67 95 | WH-ADC0309K3E5AN | WH-UDZ07KE5 | KIT-ADC07K3E5AN | 7 | 1ph | HP - All-In-One K-series - AN |
 |37 | E2 D5 0B 08 95 02 D6 0E 66 95 | WH-SDC0309K3E5 | WH-UDZ05KE5 | KIT-WC05K3E5 | 5 | 1ph | HP - split K-series |
-|38 | E2 D5 0B 08 95 02 D6 0E 67 95 | WH-SDC0309K3E5 | WH-UDZ07KE5 | KIT-WC07K3E5 | 7 | 1ph | HP - split K-series |
-|39 | E2 CF 0C 74 09 12 D0 0C 96 05 | WH-ADC0916H9E8 | WH-UX16HE8 | KIT-AXC16HE8 | 16 | 3ph | T-CAP - All-In-One |
-|40 | E2 CF 0C 74 09 12 D0 0E 95 05 | WH-ADC0912H9E8 | WH-UX12HE8 | KIT-AXC12HE8 | 12 | 3ph | T-CAP - All-In-One |
-|41 | E2 CF 0C 89 05 12 D0 0C 98 05 | WH-SDC12H9E8 | WH-UD12HE8 | KIT-WC12H9E8 | 12 | 3ph | HP |
-|42 | 32 D4 0B 89 84 73 90 0C 86 84 | Monoblock | WH-MXC16J9E8 | Monoblock | 16 | 3ph | T-CAP |
-|43 | 32 D4 0B 00 78 62 90 0B 02 78 | Monoblock | WH-MXC12J6E5 | Monoblock | 12 | 1ph | T-CAP |
+|38 | E2 D5 0B 34 99 83 92 0C 29 98 | WH-SDC0509L3E5 |  WH-WDG09LE5 | KIT-WC09L3E5 | 9 | 1 ph | HP - split L-series 3kW elec heating |
+|39 | E2 CF 0C 89 05 12 D0 0C 98 05 | WH-SDC12H9E8 | WH-UD12HE8 | KIT-WC12H9E8 | 12 | 3ph | HP |
+|40 | E2 D5 0B 08 95 02 D6 0E 67 95 | WH-SDC0309K3E5 | WH-UDZ07KE5 | KIT-WC07K3E5 | 7 | 1ph | HP - split K-series |
+|41 | E2 CF 0C 74 09 12 D0 0C 96 05 | WH-ADC0916H9E8 | WH-UX16HE8 | KIT-AXC16HE8 | 16 | 3ph | T-CAP - All-In-One |
+|42 | E2 CF 0C 74 09 12 D0 0E 95 05 | WH-ADC0912H9E8 | WH-UX12HE8 | KIT-AXC12HE8 | 12 | 3ph | T-CAP - All-In-One |
+|43 | 32 D4 0B 89 84 73 90 0C 86 84 | Monoblock | WH-MXC16J9E8 | Monoblock | 16 | 3ph | T-CAP |
+|44 | 32 D4 0B 00 78 62 90 0B 02 78 | Monoblock | WH-MXC12J6E5 | Monoblock | 12 | 1ph | T-CAP |
 
 All bytes are used for Heat Pump model identification in the code.