Merge branch 'development' into prerelease-14.3.0

2025-04-19 20:37:20 +00:00 · 2024-10-14 23:35:52 +02:00 · 2024-10-14 23:15:24 +02:00 · 2024-10-14 17:12:22 +02:00 · 2024-10-14 15:30:03 +02:00 · 2024-10-14 12:34:15 +02:00
4 changed files with 245 additions and 246 deletions
--- a/.github/workflows/Tasmota_build_master.yml
+++ b/.github/workflows/Tasmota_build_master.yml
@ -1,236 +1,236 @@
-name: Build_firmware_master
-
-on:
-  workflow_dispatch:      # Start a workflow
-  push:
-    branches: master
-    paths-ignore:
-    - '.github/**'        # Ignore changes towards the .github directory
-    - '**.md'             # Do no build if *.md files changes
-
-# Ensures that only one deploy task per branch/environment will run at a time.
-concurrency:
-  group: environment-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  safeboot-images:
-    runs-on: ubuntu-latest
-    if: github.repository == 'arendst/Tasmota'
-    continue-on-error: true
-    strategy:
-      matrix:
-        variant:
-          - tasmota32-safeboot
-          - tasmota32solo1-safeboot
-          - tasmota32c2-safeboot
-          - tasmota32c3-safeboot
-          - tasmota32c3ser-safeboot
-          - tasmota32s2-safeboot
-          - tasmota32s2cdc-safeboot
-          - tasmota32s3-safeboot
-          - tasmota32s3ser-safeboot
-          - tasmota32c6-safeboot
-          - tasmota32c6ser-safeboot
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: master
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
-      - name: Install dependencies
-        run: |
-          pip install wheel
-          pip install -U platformio
-          cp ./platformio_override_sample.ini ./platformio_override.ini
-      - name: Add "release" to footer
-        run: |
-          sed -i -e "s/TASMOTA_SHA_SHORT/TASMOTA_SHA_SHORT release-/g" ./tasmota/include/tasmota_version.h
-      - name: Run PlatformIO
-        run: platformio run -e ${{ matrix.variant }}
-      - name: Upload safeboot firmware artifacts
-        uses: jason2866/upload-artifact@v2.0.3
-        with:
-          name: firmware_safeboot
-          path: ./build_output
-
-  base-images:
-    runs-on: ubuntu-latest
-    if: github.repository == 'arendst/Tasmota'
-    continue-on-error: true
-    strategy:
-      matrix:
-        variant:
-          - tasmota
-          - tasmota-4M
-          - tasmota-minimal
-          - tasmota-display
-          - tasmota-ir
-          - tasmota-knx
-          - tasmota-lite
-          - tasmota-sensors
-          - tasmota-zbbridge
-          - tasmota-zigbee
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: master
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
-      - name: Install dependencies
-        run: |
-          pip install wheel
-          pip install -U platformio
-          cp ./platformio_override_sample.ini ./platformio_override.ini
-      - name: Add "release" to footer
-        run: |
-          sed -i -e "s/TASMOTA_SHA_SHORT/TASMOTA_SHA_SHORT release-/g" ./tasmota/include/tasmota_version.h
-      - name: Run PlatformIO
-        run: platformio run -e ${{ matrix.variant }}
-      - name: Upload firmware artifacts
-        uses: jason2866/upload-artifact@v2.0.3
-        with:
-          name: firmware
-          path: ./build_output
-
-  base32-images:
-    needs: safeboot-images
-    runs-on: ubuntu-latest
-    if: github.repository == 'arendst/Tasmota'
-    continue-on-error: true
-    strategy:
-      matrix:
-        variant:
-          - tasmota32
-          - tasmota32-zbbrdgpro
-          - tasmota32-webcam
-          - tasmota32-bluetooth
-          - tasmota32-nspanel
-          - tasmota32-display
-          - tasmota32-ir
-          - tasmota32-lvgl
-          - tasmota32c2
-          - tasmota32c3
-          - tasmota32c6
-          - tasmota32s2
-          - tasmota32s2cdc
-          - tasmota32s3
-          - tasmota32solo1
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: master
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
-      - name: Install dependencies
-        run: |
-          pip install wheel
-          pip install -U platformio
-          cp ./platformio_override_sample.ini ./platformio_override.ini
-      - name: Download safeboot firmwares
-        uses: jason2866/download-artifact@v3.0.4
-        with:
-          name: firmware_safeboot
-          path: ./firmware
-      - name: Display downloaded files
-        run: |
-          ls -R ./firmware/
-      - name: Add "release" to footer
-        run: |
-          sed -i -e "s/TASMOTA_SHA_SHORT/TASMOTA_SHA_SHORT release-/g" ./tasmota/include/tasmota_version.h
-      - name: Run PlatformIO
-        run: platformio run -e ${{ matrix.variant }}
-      - name: Upload firmware artifacts
-        uses: jason2866/upload-artifact@v2.0.3
-        with:
-          name: firmware
-          path: ./build_output
-
-  language-images:
-    needs: safeboot-images
-    runs-on: ubuntu-latest
-    if: github.repository == 'arendst/Tasmota'
-    continue-on-error: true
-    strategy:
-      matrix:
-        variant: [ tasmota, tasmota32 ]
-        language: [ AD, AF, BG, BR, CN, CZ, DE, ES, FR, FY, GR, HE, HU, IT, KO, NL, PL, PT, RO, RU, SE, SK, TR, TW, UK, VN ]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: master
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
-      - name: Install dependencies
-        run: |
-          pip install wheel
-          pip install -U platformio
-          cp ./platformio_override_sample.ini ./platformio_override.ini
-      - name: Download safeboot firmwares
-        uses: jason2866/download-artifact@v3.0.4
-        with:
-          name: firmware_safeboot
-          path: ./firmware
-      - name: Display downloaded files
-        run: |
-          ls -R ./firmware/
-      - name: Add "release" to footer
-        run: |
-          sed -i -e "s/TASMOTA_SHA_SHORT/TASMOTA_SHA_SHORT release-/g" ./tasmota/include/tasmota_version.h
-      - name: Run PlatformIO
-        run: platformio run -e ${{ matrix.variant }}-${{ matrix.language }}
-      - name: Upload language firmware artifacts
-        uses: jason2866/upload-artifact@v2.0.3
-        with:
-          name: firmware
-          path: ./build_output
-
-  Release:
-    needs: [base-images, base32-images, language-images]
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v4
-    - name: Download Tasmota firmwares
-      uses: jason2866/download-artifact@v3.0.4
-      with:
-        name: firmware
-        path: ./mv_firmware
-    - name: Download safeboot firmwares
-      uses: jason2866/download-artifact@v3.0.4
-      with:
-        name: firmware_safeboot
-        path: ./mv_firmware
-    - name: Display structure of downloaded files
-      run: ls -R ./mv_firmware/
-    - name: Zip all map.gz files in one file -> map_all.zip
-      run: 7z a -mx=9 -tzip -xr'!.*' map_all.zip mv_firmware/map
-    - name: Release
-      uses: jason2866/action-gh-release@v1.2
-      #if: startsWith(github.ref, 'refs/tags/')
-      with:
-        tag_name: ${{ github.run_number }}
-        files: |
-          ./mv_firmware/firmware/*
-          map_all.zip
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  Start_final_copy:
-    needs: Release
-    runs-on: ubuntu-latest
-    steps:
-    - name: Dispatch workflow in arendst/Tasmota-firmware
-      run: |
-         curl -X POST https://api.github.com/repos/arendst/Tasmota-firmware/actions/workflows/fetch_deploy.yml/dispatches \
-         -H 'Accept: application/vnd.github.everest-preview+json' \
-         -u ${{ secrets.API_TOKEN_GITHUB }} \
-         --data '{"ref": "gh_actions"}'
+name: Build_firmware_master
+
+on:
+  workflow_dispatch:      # Start a workflow
+  push:
+    branches: master
+    paths-ignore:
+    - '.github/**'        # Ignore changes towards the .github directory
+    - '**.md'             # Do no build if *.md files changes
+
+# Ensures that only one deploy task per branch/environment will run at a time.
+concurrency:
+  group: environment-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  safeboot-images:
+    runs-on: ubuntu-latest
+    if: github.repository == 'arendst/Tasmota'
+    continue-on-error: true
+    strategy:
+      matrix:
+        variant:
+          - tasmota32-safeboot
+          - tasmota32solo1-safeboot
+          - tasmota32c2-safeboot
+          - tasmota32c3-safeboot
+          - tasmota32c3ser-safeboot
+          - tasmota32s2-safeboot
+          - tasmota32s2cdc-safeboot
+          - tasmota32s3-safeboot
+          - tasmota32s3ser-safeboot
+          - tasmota32c6-safeboot
+          - tasmota32c6ser-safeboot
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: master
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+      - name: Install dependencies
+        run: |
+          pip install wheel
+          pip install -U platformio
+          cp ./platformio_override_sample.ini ./platformio_override.ini
+      - name: Add "release" to footer
+        run: |
+          sed -i -e "s/TASMOTA_SHA_SHORT/TASMOTA_SHA_SHORT release-/g" ./tasmota/include/tasmota_version.h
+      - name: Run PlatformIO
+        run: platformio run -e ${{ matrix.variant }}
+      - name: Upload safeboot firmware artifacts
+        uses: jason2866/upload-artifact@v2.0.3
+        with:
+          name: firmware_safeboot
+          path: ./build_output
+
+  base-images:
+    runs-on: ubuntu-latest
+    if: github.repository == 'arendst/Tasmota'
+    continue-on-error: true
+    strategy:
+      matrix:
+        variant:
+          - tasmota
+          - tasmota-4M
+          - tasmota-minimal
+          - tasmota-display
+          - tasmota-ir
+          - tasmota-knx
+          - tasmota-lite
+          - tasmota-sensors
+          - tasmota-zbbridge
+          - tasmota-zigbee
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: master
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+      - name: Install dependencies
+        run: |
+          pip install wheel
+          pip install -U platformio
+          cp ./platformio_override_sample.ini ./platformio_override.ini
+      - name: Add "release" to footer
+        run: |
+          sed -i -e "s/TASMOTA_SHA_SHORT/TASMOTA_SHA_SHORT release-/g" ./tasmota/include/tasmota_version.h
+      - name: Run PlatformIO
+        run: platformio run -e ${{ matrix.variant }}
+      - name: Upload firmware artifacts
+        uses: jason2866/upload-artifact@v2.0.3
+        with:
+          name: firmware
+          path: ./build_output
+
+  base32-images:
+    needs: safeboot-images
+    runs-on: ubuntu-latest
+    if: github.repository == 'arendst/Tasmota'
+    continue-on-error: true
+    strategy:
+      matrix:
+        variant:
+          - tasmota32
+          - tasmota32-zbbrdgpro
+          - tasmota32-webcam
+          - tasmota32-bluetooth
+          - tasmota32-nspanel
+          - tasmota32-display
+          - tasmota32-ir
+          - tasmota32-lvgl
+          - tasmota32c2
+          - tasmota32c3
+          - tasmota32c6
+          - tasmota32s2
+          - tasmota32s2cdc
+          - tasmota32s3
+          - tasmota32solo1
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: master
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+      - name: Install dependencies
+        run: |
+          pip install wheel
+          pip install -U platformio
+          cp ./platformio_override_sample.ini ./platformio_override.ini
+      - name: Download safeboot firmwares
+        uses: jason2866/download-artifact@v3.0.4
+        with:
+          name: firmware_safeboot
+          path: ./firmware
+      - name: Display downloaded files
+        run: |
+          ls -R ./firmware/
+      - name: Add "release" to footer
+        run: |
+          sed -i -e "s/TASMOTA_SHA_SHORT/TASMOTA_SHA_SHORT release-/g" ./tasmota/include/tasmota_version.h
+      - name: Run PlatformIO
+        run: platformio run -e ${{ matrix.variant }}
+      - name: Upload firmware artifacts
+        uses: jason2866/upload-artifact@v2.0.3
+        with:
+          name: firmware
+          path: ./build_output
+
+  language-images:
+    needs: safeboot-images
+    runs-on: ubuntu-latest
+    if: github.repository == 'arendst/Tasmota'
+    continue-on-error: true
+    strategy:
+      matrix:
+        variant: [ tasmota, tasmota32 ]
+        language: [ AD, AF, BG, BR, CN, CZ, DE, ES, FR, FY, GR, HE, HU, IT, KO, NL, PL, PT, RO, RU, SE, SK, TR, TW, UK, VN ]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: master
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+      - name: Install dependencies
+        run: |
+          pip install wheel
+          pip install -U platformio
+          cp ./platformio_override_sample.ini ./platformio_override.ini
+      - name: Download safeboot firmwares
+        uses: jason2866/download-artifact@v3.0.4
+        with:
+          name: firmware_safeboot
+          path: ./firmware
+      - name: Display downloaded files
+        run: |
+          ls -R ./firmware/
+      - name: Add "release" to footer
+        run: |
+          sed -i -e "s/TASMOTA_SHA_SHORT/TASMOTA_SHA_SHORT release-/g" ./tasmota/include/tasmota_version.h
+      - name: Run PlatformIO
+        run: platformio run -e ${{ matrix.variant }}-${{ matrix.language }}
+      - name: Upload language firmware artifacts
+        uses: jason2866/upload-artifact@v2.0.3
+        with:
+          name: firmware
+          path: ./build_output
+
+  Release:
+    needs: [base-images, base32-images, language-images]
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+    - uses: actions/checkout@v4
+    - name: Download Tasmota firmwares
+      uses: jason2866/download-artifact@v3.0.4
+      with:
+        name: firmware
+        path: ./mv_firmware
+    - name: Download safeboot firmwares
+      uses: jason2866/download-artifact@v3.0.4
+      with:
+        name: firmware_safeboot
+        path: ./mv_firmware
+    - name: Display structure of downloaded files
+      run: ls -R ./mv_firmware/
+    - name: Zip all map.gz files in one file -> map_all.zip
+      run: 7z a -mx=9 -tzip -xr'!.*' map_all.zip mv_firmware/map
+    - name: Release
+      uses: jason2866/action-gh-release@v1.2
+      #if: startsWith(github.ref, 'refs/tags/')
+      with:
+        tag_name: ${{ github.run_number }}
+        files: |
+          ./mv_firmware/firmware/*
+          map_all.zip
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  Start_final_copy:
+    needs: Release
+    runs-on: ubuntu-latest
+    steps:
+    - name: Dispatch workflow in arendst/Tasmota-firmware
+      run: |
+         curl -X POST https://api.github.com/repos/arendst/Tasmota-firmware/actions/workflows/fetch_deploy.yml/dispatches \
+         -H 'Accept: application/vnd.github.everest-preview+json' \
+         -u ${{ secrets.API_TOKEN_GITHUB }} \
+         --data '{"ref": "gh_actions"}'
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,9 +1,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.

-## [Unreleased] - Development
+## [Released]

-## [14.2.0.6]
+## [14.3.0] 20241015
+- Release Robert
+
+## [14.2.0.6] 20241015
 ### Added
 - Support for Sonoff SPM v1.3.0 (#13447)
 - LVGL port `colorwheel` from LVGL 8 (#22244)
@ -19,8 +22,6 @@ All notable changes to this project will be documented in this file.
 - Misubishi Electric HVAC prohibit function (#22269)
 - Misubishi Electric HVAC compressor map and operation power and energy (#22290)

-### Breaking Changed
-
 ### Changed
 - ESP32 platform update from 2024.09.10 to 2024.09.30 and Framework (Arduino Core) from v3.0.5 to v3.1.0.240926 (#22203)
 - Berry improve `persist` dirty data handling (#22246)
@ -137,8 +138,6 @@ All notable changes to this project will be documented in this file.
 ### Removed
 - ESP8266 Analog input support using energy driver as only one channel is available

-## [Released]
-
 ## [14.2.0] 20240814
 - Release Rita

--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@ -75,7 +75,7 @@ Latest released binaries can be downloaded from
 - http://ota.tasmota.com/tasmota/release

 Historical binaries can be downloaded from
- http://ota.tasmota.com/tasmota/release-14.2.0
+- http://ota.tasmota.com/tasmota/release-14.3.0

 The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmota.com/tasmota/release/tasmota.bin.gz``

@ -104,7 +104,7 @@ Latest released binaries can be downloaded from
 - https://ota.tasmota.com/tasmota32/release

 Historical binaries can be downloaded from
- https://ota.tasmota.com/tasmota32/release-14.2.0
+- https://ota.tasmota.com/tasmota32/release-14.3.0

 The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasmota.com/tasmota32/release/tasmota32.bin``

@ -114,7 +114,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm

 [Complete list](BUILDS.md) of available feature and sensors.

-## Changelog v14.2.0.6
+## Changelog v14.3.0 Robert
 ### Added
 - Command ``SetOption69 1`` to enable Serial Bridge inverted Receive [#22000](https://github.com/arendst/Tasmota/issues/22000)
 - Command ``DaliWeb 1`` to enable light control for DALI broadcast address
--- a/tasmota/include/tasmota_version.h
+++ b/tasmota/include/tasmota_version.h
@ -22,6 +22,6 @@

 #define TASMOTA_SHA_SHORT                      // Filled by Github sed

-const uint32_t TASMOTA_VERSION = 0x0E020006;   // 14.2.0.6
+const uint32_t TASMOTA_VERSION = 0x0E030000;   // 14.3.0.0

 #endif  // _TASMOTA_VERSION_H_