From cb9fb8ddd420ff793d9a1c3a25a11964787f7945 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 17:29:09 +0100 Subject: [PATCH 01/13] Update actions/upload-artifact --- .github/workflows/wled-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index d9933bd3..3ac09572 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -61,13 +61,13 @@ jobs: env: WLED_RELEASE: True run: pio run -e ${{ matrix.environment }} - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: firmware-${{ matrix.environment }} path: | build_output/firmware/*.bin build_output/firmware/*.gz - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: startsWith(github.ref, 'refs/tags/') with: name: firmware-release From 908481a55ad054ffe54ce4a5db20ab61c32e6810 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 17:47:00 +0100 Subject: [PATCH 02/13] Tweak github caching --- .github/workflows/wled-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index 3ac09572..236c569d 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -51,6 +51,9 @@ jobs: with: path: ~/.platformio key: ${{ runner.os }}-${{ matrix.environment}}-${{ hashFiles('platformio.ini') }} + restore-keys: | + ${{ runner.os }}-${{ matrix.environment}} + - name: Set up Python uses: actions/setup-python@v4 with: From fff7a47ab54d0fa17dc7ff79f31366913317ddc4 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 17:53:49 +0100 Subject: [PATCH 03/13] Update actions/checkout action --- .github/workflows/wled-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index 236c569d..bce567bc 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -8,7 +8,7 @@ jobs: name: Gather Environments runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Cache pip uses: actions/cache@v3 with: @@ -38,7 +38,7 @@ jobs: matrix: environment: ${{ fromJSON(needs.get_default_envs.outputs.environments) }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Cache pip uses: actions/cache@v3 with: From ebbd06800e335fa569ee05e95ccd855ec7d4a9d3 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 17:55:12 +0100 Subject: [PATCH 04/13] Update actions/setup-python action --- .github/workflows/wled-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index bce567bc..c57a4d93 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -16,7 +16,7 @@ jobs: key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip- - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.9' - name: Install PlatformIO From dabda3a02c3994040cb46bd4e2c69f36b16ebef0 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 17:56:00 +0100 Subject: [PATCH 05/13] Update actions/cache action --- .github/workflows/wled-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index c57a4d93..b9b77423 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Cache pip - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} @@ -40,14 +40,14 @@ jobs: steps: - uses: actions/checkout@v4 - name: Cache pip - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip- - name: Cache PlatformIO - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.platformio key: ${{ runner.os }}-${{ matrix.environment}}-${{ hashFiles('platformio.ini') }} From 1e04f4bdb793514bd54bd88cf5e484056eb64c72 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 17:59:53 +0100 Subject: [PATCH 06/13] Update actions/setup-python action --- .github/workflows/wled-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index b9b77423..62cee507 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -55,7 +55,7 @@ jobs: ${{ runner.os }}-${{ matrix.environment}} - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.9' - name: Install PlatformIO From d08b4a51fa842919e23328cc40b8150e371432bc Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 18:07:48 +0100 Subject: [PATCH 07/13] Fix artifact upload --- .github/workflows/wled-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index 62cee507..dcd92b6c 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -64,12 +64,13 @@ jobs: env: WLED_RELEASE: True run: pio run -e ${{ matrix.environment }} + - name: Rename Bin + run: mv .pio/build/${{ matrix.environment }}/firmware.bin firmware-${{ matrix.environment }}.bin - uses: actions/upload-artifact@v4 with: name: firmware-${{ matrix.environment }} path: | - build_output/firmware/*.bin - build_output/firmware/*.gz + .pio/build/${{ matrix.environment }}/firmware.bin - uses: actions/upload-artifact@v4 if: startsWith(github.ref, 'refs/tags/') with: From 3f674aeaa352223d7b82028006948a3d259c1b8d Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 18:11:31 +0100 Subject: [PATCH 08/13] Fix artifact upload --- .github/workflows/wled-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index dcd92b6c..91f94d1b 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -65,12 +65,11 @@ jobs: WLED_RELEASE: True run: pio run -e ${{ matrix.environment }} - name: Rename Bin - run: mv .pio/build/${{ matrix.environment }}/firmware.bin firmware-${{ matrix.environment }}.bin + run: mv -v .pio/build/${{ matrix.environment }}/firmware.bin firmware-${{ matrix.environment }}.bin - uses: actions/upload-artifact@v4 with: name: firmware-${{ matrix.environment }} - path: | - .pio/build/${{ matrix.environment }}/firmware.bin + path: firmware-${{ matrix.environment }}.bin - uses: actions/upload-artifact@v4 if: startsWith(github.ref, 'refs/tags/') with: From 678243f5ca904648cce5ffd0cdb18377cfbf540d Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 18:23:30 +0100 Subject: [PATCH 09/13] Fix artifact upload --- .github/workflows/wled-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index 91f94d1b..e78c1c73 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -73,7 +73,7 @@ jobs: - uses: actions/upload-artifact@v4 if: startsWith(github.ref, 'refs/tags/') with: - name: firmware-release + name: firmware-release-${{ matrix.environment }} path: build_output/release/*.bin release: name: Create Release From 163ba3aaf6a175e89c819c5d9e165787e7706a16 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 18:32:22 +0100 Subject: [PATCH 10/13] Update actions/download-artifct action --- .github/workflows/wled-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index e78c1c73..829eeeca 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -81,7 +81,7 @@ jobs: needs: [get_default_envs, build] if: startsWith(github.ref, 'refs/tags/') steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v4 with: name: firmware-release - name: Create draft release From 2276080c67d9ca705b2de0f87fd7c52f43077754 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 7 Sep 2024 18:56:59 +0100 Subject: [PATCH 11/13] Fix artifact upload --- .github/workflows/wled-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index 829eeeca..e875ca18 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -83,7 +83,9 @@ jobs: steps: - uses: actions/download-artifact@v4 with: - name: firmware-release + name: firmware-release-* + - name: List Artifacts + run: find ./ - name: Create draft release uses: softprops/action-gh-release@v1 with: From 645b45a22d8540ca7203f2cea605e6b952a17a17 Mon Sep 17 00:00:00 2001 From: Troy <5659019+troyhacks@users.noreply.github.com> Date: Mon, 16 Sep 2024 14:19:06 -0400 Subject: [PATCH 12/13] Added WLEDMM_NO_MAP_RESET Allows use of ledmaps with segments without messing with the segments. LEDs can remain remapped even with segments on top of them. (For Dom) --- wled00/FX_fcn.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp index 1f086fe0..95e0028c 100644 --- a/wled00/FX_fcn.cpp +++ b/wled00/FX_fcn.cpp @@ -2558,6 +2558,7 @@ bool WS2812FX::deserializeMap(uint8_t n) { uint16_t maxHeight = atoi(cleanUpName(fileName)); //DEBUG_PRINTF(" (\"height\": %s) \n", fileName) + #ifndef WLEDMM_NO_MAP_RESET //WLEDMM: support ledmap file properties width and height: if found change segment if (maxWidth * maxHeight > 0) { Segment::maxWidth = maxWidth; @@ -2566,6 +2567,7 @@ bool WS2812FX::deserializeMap(uint8_t n) { } else setUpMatrix(); //reset segment sizes to panels + #endif } USER_PRINTF("deserializeMap %d x %d\n", Segment::maxWidth, Segment::maxHeight); From 9fc279a3a6b5bd7ba4f2d70d6e5e2968f7b203bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bla=C5=BE=20Kristan?= Date: Sat, 14 Sep 2024 22:51:19 +0200 Subject: [PATCH 13/13] Merge pull request #4142 from willmmiles/fix-webserver-pin Fix AsyncWebServer version pin --- platformio.ini | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index b5b93187..34b118e7 100644 --- a/platformio.ini +++ b/platformio.ini @@ -248,7 +248,7 @@ lib_deps = ;;makuna/NeoPixelBus @ 2.7.5 ;; WLEDMM will be added in board specific sections ;;https://github.com/Aircoookie/ESPAsyncWebServer.git @ ~2.0.7 ;; https://github.com/lost-hope/ESPAsyncWebServer.git#master ;; WLEDMM to display .log and .wled files in /edit - https://github.com/Aircoookie/ESPAsyncWebServer.git @ 2.2.1 ;; newer with bugfixes and stability improvements + https://github.com/Aircoookie/ESPAsyncWebServer.git#v2.2.1 ;; newer with bugfixes and stability improvements #For use of the TTGO T-Display ESP32 Module with integrated TFT display uncomment the following line #TFT_eSPI #For compatible OLED display uncomment following @@ -297,6 +297,37 @@ lib_deps = makuna/NeoPixelBus @ 2.7.5 ${env.lib_deps} +;; compatibilty flags - same as 0.14.0 which seems to work better on some 8266 boards. Not using PIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48 +build_flags_compat = + -DESP8266 + -DFP_IN_IROM + ;;-Wno-deprecated-declarations + -Wno-misleading-indentation + ;;-Wno-attributes ;; silence warnings about unknown attribute 'maybe_unused' in NeoPixelBus + -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 + -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH + -DVTABLES_IN_FLASH + -DMIMETYPE_MINIMAL + -DWLED_SAVE_IRAM ;; needed to prevent linker error + +;; this platform version was used for WLED 0.14.0 +platform_compat = espressif8266@4.2.0 +platform_packages_compat = + platformio/toolchain-xtensa @ ~2.100300.220621 #2.40802.200502 + platformio/tool-esptool #@ ~1.413.0 + platformio/tool-esptoolpy #@ ~1.30000.0 + +;; experimental - for using older NeoPixelBus 2.7.9 +lib_deps_compat = + ESPAsyncTCP @ 1.2.2 + ESPAsyncUDP + ESP8266PWM + fastled/FastLED @ 3.6.0 + IRremoteESP8266 @ 2.8.2 + makuna/NeoPixelBus @ 2.7.9 + https://github.com/Aircoookie/ESPAsyncWebServer.git#v2.2.1 + + [esp32] #platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.3/platform-espressif32-2.0.2.3.zip platform = espressif32@3.5.0