Merge branch 'main' into remove-v1-usermod

Remove V1 usermod
2026-06-25 22:31:39 +00:00 · 2026-05-29 15:01:16 +02:00 · 2025-08-09 15:22:41 +01:00
48 changed files with 358 additions and 830 deletions
@@ -17,7 +17,7 @@ language: en-US

 reviews:
  # generic review setting, see https://docs.coderabbit.ai/reference/configuration#reference
-  auto_apply_labels: false
+  auto_apply_labels: true
  # abort_on_close: false
  high_level_summary: true
  review_status: true
@@ -33,13 +33,6 @@ reviews:
      - V5
    ignore_title_keywords:
      - WIP
-  tools:
-    fbinfer:
-      enabled: false   # Arduino.h not available on Linux analysis host
-    cppcheck:
-      enabled: true    # cppcheck works fine without Arduino headers
-    clang:
-      enabled: true    # clang tidy likewise works

  path_instructions:
    - path: "**/*.{cpp,h,hpp,ino}"
@@ -55,11 +48,11 @@ reviews:
        NOT to effect functions in FX.cpp, which have diverse contributor styles.

        When reviewing PRs labeled "AI" or when source code appears to be AI-generated, perform these additional checks:
-        1. VERIFY all referenced preprocessor macros, constants and flags exist by searching the codebase - do not trust the AI's claims about what exists.
+        1. VERIFY all referenced constants, flags, and functions exist by searching the codebase - do not trust the AI's claims about what exists.
        2. CHECK for reinvention: search for existing functions/patterns that already solve the same problem.
        3. CHECK for singleton data (defined but never used) and for dead/disabled code, and suggest to remove them.
        4. VERIFY comments match code behavior - AI frequently generates plausible but incorrect comments.
-        5. VERIFY numerical stability / accuracy of arithmetic expressions. AI is often wrong when it comes to math and numbers.
+        5. VERIFY numerical stability / accuracy of fixed-point arithmetic.
        6. CHECK for implied but weakly justified assumptions - like usermod loop() call frequency - and ask for clarification.
        7. FLAG changes that appear unrelated: deleted comments, unnecessary re-formatting or re-factoring, and modifications in files that seem unrelated to the PR description.

@@ -50,7 +50,7 @@ For detailed build timeouts, development workflows, troubleshooting, and validat
 main                # Main development trunk (daily/nightly) 17.0.0-dev
  ├── V5            # special branch: code rework for esp-idf 5.5.x (unstable)
      ├── V5-C6     # special branch: integration of new MCU types: esp32-c5, esp32-c6, esp32-p4 (unstable)
-16_x                # maintenance for release 16.x.y
+16_x                # current beta, preparations for next release 16.0.0
 0_15_x              # maintenance (bugfixes only) for current release 0.15.4
 (tag) v0.14.4       # previous version 0.14.4 (no maintenance)
 (tag) v0.13.3       # old version 0.13.3 (no maintenance)
@@ -60,7 +60,6 @@ main                # Main development trunk (daily/nightly) 17.0.0-dev

 - ``main``: development trunk (daily/nightly)
 - ``V5`` and ``V5-C6``: code rework for esp-idf 5.5.x (unstable) - branched from ``main``.
- ``16_x``: maintenance for release 16.x.y
 - ``0_15_x``: bugfixing / maintenance for release 0.15.x

 ### Repository Structure
@@ -34,7 +34,7 @@ jobs:
          # Exclude issues that were closed without resolution from changelog
          excludeLabels: 'stale,wontfix,duplicate,invalid,external,question,use-as-is,not_planned'
      - name: Update Nightly Release
-        uses: andelf/nightly-release@5834076edc55cc05975561c9722043f072ac5c26
+        uses: andelf/nightly-release@main
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
@@ -4,9 +4,6 @@ on:
  pull_request:
    paths:
      - usermods/**
-  push:
-    paths:
-      - usermods/**

 env:
  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
@@ -15,40 +12,28 @@ jobs:

  get_usermod_envs:
    # Only run for pull requests from forks (not from branches within wled/WLED)
-    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
+    if: github.event.pull_request.head.repo.full_name != github.repository
    name: Gather Usermods
    runs-on: ubuntu-latest
    steps:
    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
      with:
-        fetch-depth: 0
-    - name: Get changed usermod environments
+        python-version: '3.12'
+        cache: 'pip'
+    - name: Install PlatformIO
+      run: pip install -r requirements.txt
+    - name: Get default environments
      id: envs
      run: |
-        # Usermods whose directories changed in this PR
-        changed=$(git diff --name-only ${{ github.event.pull_request.base.sha }} HEAD \
-          | grep '^usermods/' | cut -d/ -f2 | sort -u || true)
-
-        # All usermods with a library.json (excluding known-incompatible ones)
-        all=$(find usermods/ -name library.json \
-          | xargs dirname | xargs -n 1 basename \
-          | grep -v PWM_fan | grep -v BME68X_v2 | grep -v pixels_dice_tray \
-          | sort || true)
-
-        if [ -z "$changed" ] || [ -z "$all" ]; then
-          echo "usermods=[]" >> $GITHUB_OUTPUT
-        else
-          usermods=$(comm -12 <(echo "$all") <(echo "$changed") | jq -R | jq --slurp -c)
-          echo "usermods=$usermods" >> $GITHUB_OUTPUT
-        fi
+        echo "usermods=$(find usermods/ -name library.json | xargs dirname | xargs -n 1 basename | jq -R | grep -v PWM_fan | grep -v BME68X_v2| grep -v pixels_dice_tray | jq --slurp -c)" >> $GITHUB_OUTPUT
    outputs:
      usermods: ${{ steps.envs.outputs.usermods }}


  build:
    # Only run for pull requests from forks (not from branches within wled/WLED)
-    # Skip when no changed usermods were found (e.g. only non-library changes)
-    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository && needs.get_usermod_envs.outputs.usermods != '[]'
+    if: github.event.pull_request.head.repo.full_name != github.repository
    name: Build Enviornments
    runs-on: ubuntu-latest
    needs: get_usermod_envs
@@ -89,85 +74,4 @@ jobs:
        cat platformio_override.ini

    - name: Build firmware
-      run: pio run -e ${{ matrix.environment }}
-
-
-  get_custom_build_envs:
-    name: Gather Custom Build Environments
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: Find usermods with custom build environments
-      id: custom_envs
-      run: |
-        # On PRs: only scan usermods whose directories changed.
-        # On push: scan all usermods (validates the full set on merge).
-        if [ "${{ github.event_name }}" = "pull_request" ]; then
-          changed=$(git diff --name-only ${{ github.event.pull_request.base.sha }} HEAD \
-            | grep '^usermods/' | cut -d/ -f2 | sort -u || true)
-          if [ -z "$changed" ]; then
-            echo "matrix=[]" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-          samples=$(for mod in $changed; do
-            f="usermods/$mod/platformio_override.ini.sample"
-            [ -f "$f" ] && echo "$f"
-          done | sort)
-        else
-          samples=$(find usermods/ -name "platformio_override.ini.sample" | sort)
-        fi
-
-        result='[]'
-        for sample in $samples; do
-          usermod=$(dirname "$sample" | xargs basename)
-          # Skip usermods known to be incompatible (same list as get_usermod_envs)
-          case "$usermod" in PWM_fan|BME68X_v2|pixels_dice_tray) continue ;; esac
-          envs=$(grep -E '^\[env:[^]]+\]' "$sample" | sed 's/^\[env:\(.*\)\]$/\1/')
-          for env in $envs; do
-            result=$(echo "$result" | jq --arg u "$usermod" --arg e "$env" '. + [{usermod: $u, env: $e}]')
-          done
-        done
-        echo "matrix=$(echo "$result" | jq -c '.')" >> $GITHUB_OUTPUT
-    outputs:
-      matrix: ${{ steps.custom_envs.outputs.matrix }}
-
-
-  build_custom:
-    name: Build Custom Env (${{ matrix.usermod }} / ${{ matrix.env }})
-    runs-on: ubuntu-latest
-    needs: get_custom_build_envs
-    if: needs.get_custom_build_envs.outputs.matrix != '[]'
-    strategy:
-      fail-fast: false
-      matrix:
-        include: ${{ fromJSON(needs.get_custom_build_envs.outputs.matrix) }}
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-        cache: 'npm'
-    - run: npm ci
-    - name: Cache PlatformIO
-      uses: actions/cache@v4
-      with:
-        path: |
-          ~/.platformio/.cache
-          ~/.buildcache
-          build_output
-        key: pio-${{ runner.os }}-${{ matrix.env }}-${{ hashFiles('platformio.ini', 'pio-scripts/output_bins.py') }}-${{ hashFiles('wled00/**', 'usermods/**') }}
-        restore-keys: pio-${{ runner.os }}-${{ matrix.env }}-${{ hashFiles('platformio.ini', 'pio-scripts/output_bins.py') }}-
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.12'
-        cache: 'pip'
-    - name: Install PlatformIO
-      run: pip install -r requirements.txt
-    - name: Apply custom build environment
-      run: cp -v "usermods/${{ matrix.usermod }}/platformio_override.ini.sample" platformio_override.ini
-    - name: Build firmware
-      run: pio run -e ${{ matrix.env }}
+      run: pio run -e ${{ matrix.environment }}    
@@ -163,7 +163,7 @@ Background Info:
 - Use FreeRTOS mutexes, semaphores or queues when true concurrent access from multiple FreeRTOS tasks is possible, and race-conditions can lead to unexpected behaviour.
 - **Avoid `portENTER_CRITICAL()` / `portEXIT_CRITICAL()`**, as these functions stall the complete system and may cause LEDs flickering. Prefer FreeRTOS mutexes, semaphores or queues.
 - **Important**: Not every shared resource needs a mutex. Some synchronization is guaranteed by the overall control flow, for example when function calls are sequenced within the same loop iteration.
- Consider using `std::atomic` or RAII scoped guards as alternatives to mutexes, semaphores or queues.
+- Consider RAII as an alternative to  mutexes or semaphores.

 ## Web UI Code Style (wled00/data/)

@@ -198,10 +198,10 @@ REGISTER_USERMOD(myUsermod);

 refer to detailed examples in `usermods/EXAMPLE/`, `usermods/user_fx/` and [in the user documentation for custom features](https://kno.wled.ge/advanced/custom-features/).

- Activate via `custom_usermods = ` in platformio build config. The `usermod_v2_` prefix or `_v2` suffix can be omitted.
- Base new usermods on `usermods/EXAMPLE/` (never edit the example directly)
- Store repeated strings as `static const char[] PROGMEM`
- Add usermod IDs to `wled00/const.h` **only when a unique ID is required** (see below)
+### Usermod `loop()`
+
+- Called once per main loop iteration. Usermods should simply `return` when `!enabled`.
+- Frequency of calls varies with system load - up to 2000 times/sec with few LEDs and little background activity, down to 1-3 times/sec during FS activity or during high workload from effects and other usermods.

 ### Usermod IDs

@@ -213,13 +213,10 @@ A unique ID (registered in `wled00/const.h` and overriding `getId()`) is **only

 If none of the above apply, the usermod may omit `getId()` (or return the default `USERMOD_ID_UNSPECIFIED`) and does **not** need an entry in `const.h`.

-### Usermod `loop()`
-
- Called once per main loop iteration. Usermods should simply `return` when `!enabled`.
- Frequency of calls varies with system load:
-    * up to 2000 times/sec with few LEDs and little background activity,
-    * between 20 and 300 times/second during high workload from effects and other usermods,
-    * (worst case) down to 1-3 times/sec during FS activity or when serving lots of network API requests.
+- Add usermod IDs to `wled00/const.h` **only when a unique ID is required** (see above)
+- Activate via `custom_usermods` in platformio build config
+- Base new usermods on `usermods/EXAMPLE/` (never edit the example directly)
+- Store repeated strings as `static const char[] PROGMEM`

 ## CI/CD

@@ -233,7 +230,7 @@ No automated linting is configured. Match existing code style in files you edit.

 ## General Rules

- Important: Repository language is **English**. This applies to source code (including comments), commit messages and any kind of documentation for developer or users.
+- Repository language is English.
 - The `docs/` folder is for developer/contributor information (coding conventions, architecture, etc.). User documentation is maintained in the [wled/WLED-Docs](https://github.com/wled/WLED-Docs) repository.
 - Never edit or commit auto-generated `wled00/html_*.h` / `wled00/js_*.h`.
 - When updating an existing PR, retain the original description. Only modify it to ensure technical accuracy. Add change logs after the existing description.
@@ -10,8 +10,8 @@ We'll work with you to refine your contribution, but we'll also push back if som
 Here are a few suggestions to make it easier for you to contribute:

 ### Important Developer Infos
-* [Project Structure, Files and Directories](AGENTS.md#project-structure) (in our AI instructions)
-* [Instructions for creating usermods](AGENTS.md#usermod-pattern) (in our AI instructions)
+* [Project Structure, Files and Directories](.github/copilot-instructions.md#project-structure-overview) (in our AI instructions)
+* [Instructions for creating usermods](.github/copilot-instructions.md#usermod-guidelines) (in our AI instructions)
 * KB: [Compiling WLED](https://kno.wled.ge/advanced/compiling-wled/) - slightly outdated but still helpful :-)
 * Arduino IDE is not supported any more. Use VSCode with the PlatformIO extension. 
 * [Compiling in VSCode/Platformio](https://github.com/wled/WLED-Docs/issues/161) - modern way without command line or platformio.ini changes.
@@ -141,6 +141,8 @@ Sometimes you might hit merge conflicts with `main` that are harder to solve. He
 ### Additional Resources
 Want to know more? Check out:
 - 📚 [GitHub Desktop documentation](https://docs.github.com/en/desktop) - if you prefer GUI tools
+- 🎓 [How to properly submit a PR](https://github.com/wled-dev/WLED/wiki/How-to-properly-submit-a-PR) - detailed tips and tricks
+

 ## After Approval
 Once approved, a maintainer will merge your PR (possibly squashing commits). 
@@ -515,8 +515,6 @@ void myTask(void*) {

 - **LittleFS filenames**: File paths passed to `file.open()` must not exceed 255 bytes (`LFS_NAME_MAX`). Validate constructed paths (e.g., `/ledmap_` + segment name + `.json`) stay within this limit (assume standard configurations, like WLED_MAX_SEGNAME_LEN = 64).

- In C/C++, additive operators (`+`, `-`) have HIGHER precedence than shift operators (`<<`, `>>`). Therefore `x - edge0 << 8` correctly parses as `(x - edge0) << 8`. Do NOT flag this pattern as a precedence bug. When reviewing WLED fixed-point code or any C/C++ shift expressions, verify against cppreference before claiming precedence issues with mixed `-`/`+` and `<<`/`>>` expressions.
-
 - **Float-to-unsigned conversion is undefined behavior when the value is out of range.** Converting a negative `float` directly to an unsigned integer type (`uint8_t`, `uint16_t`, …) is UB per the C++ standard — the Xtensa (ESP32) toolchain may silently wrap, but RISC-V (ESP32-C3/C5/C6/P4) can produce different results due to clamping. Cast through a signed integer first:
  ```cpp
  // Undefined behavior — avoid:
@@ -68,6 +68,7 @@ De-prioritize unless explicitly introduced by a PR:
 - Prefer bounded alternatives for string operations (`strnlen`, `strncmp`, `strncpy`, `strlcpy`, `snprintf`).
 - Treat a finding against FW1 as **suggestion** only when the operation is provably bounded
  and both the destination capacity and copied/compared length are known safe.
+   and both the destination capacity and copied/compared length are known safe.

 ### FW2: Format-string injection
 - **Severity**: CRITICAL
@@ -86,7 +87,6 @@ De-prioritize unless explicitly introduced by a PR:
 ### FW5: Missing auth checks on state-changing endpoints (where auth is feasible)
 - **Severity**: CRITICAL
 - HTTP/JSON and other control paths that support auth must enforce configured auth policy.
- Do not flag the HTTP endpoint `/reset` as state-changing. This endpoint triggers a reboot, causing a short interruption without loss of user data.
 - Do not flag standards-based UDP multicast/broadcast paths solely for lacking authentication when authentication is not defined in the protocol specification.

 ### FW6: Fail-open behavior after parse or allocation errors
@@ -196,7 +196,6 @@ platform_packages = platformio/toolchain-xtensa @ ~2.100300.220621 #2.40802.2005

 platform = ${esp8266.platform_wled_default}
 build_unflags = ${common.build_unflags}
-custom_usermods = 
 build_flags =
  -DESP8266
  -DFP_IN_IROM
@@ -299,18 +298,8 @@ AR_lib_deps =  ;; for pre-usermod-library platformio_override compatibility
 ;; please note that you can NOT update existing ESP32 installs with a "V4" build. Also updating by OTA will not work properly.
 ;; You need to completely erase your device (esptool erase_flash) first, then install the "V4" build from VSCode+platformio.

-;; tasmota platform (default)
 platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.06.00/platform-espressif32.zip ;; Tasmota Arduino Core 2.0.18 with IPv6 support, based on IDF 4.4.8
 platform_packages =
-
-;; espressif platform (optional - needs 300KB extra flash)
-;;; arduino-esp32 2.0.17 + esp-idf 4.4.7
-;; platform = espressif32@ ~6.13.0
-;; platform_packages =
-;;; arduino-esp32 2.0.14 + esp-idf 4.4.6
-;; platform = espressif32@ ~6.6.0
-;; platform_packages = platformio/framework-arduinoespressif32 @ 3.20014.231204
-
 build_unflags = ${common.build_unflags}
 build_flags = -g
  -Wshadow=compatible-local ;; emit warning in case a local variable "shadows" another local one
@@ -490,7 +479,7 @@ build_flags = ${common.build_flags} ${esp8266.build_flags} -D WLED_RELEASE_NAME=
  -D WLED_DISABLE_PARTICLESYSTEM1D
  -D WLED_DISABLE_PARTICLESYSTEM2D
  -D WLED_DISABLE_PIXELFORGE
-;; custom_usermods = audioreactive ;; pushed program flash size over the limits
+custom_usermods = audioreactive

 [env:esp32dev]
 extends = esp32
@@ -731,7 +720,6 @@ board_build.partitions = ${esp32.extreme_partitions}  ; We're gonna need a bigge
 ;; Core HUB75 flags - common to every HUB75 build
 build_flags =
  -D WLED_ENABLE_HUB75MATRIX -D NO_GFX
-  -D NO_CIE1931 ;; disable driver-internal gamma correction
  -D WLED_DEBUG_BUS
  -D LED_TYPES=TYPE_HUB75MATRIX_HS
  ; -D WLED_DEBUG
@@ -791,21 +779,6 @@ lib_deps = ${esp32s3.lib_deps}
           ${hub75.lib_deps}
 ;; board_build.partitions = tools/partitions-8MB_spiffs-tinyuf2.csv ;; supports adafruit UF2 bootloader

-[env:waveshare_esp32s3_32MB_hub75]
-;; Waveshare ESP32-S3-RGB-Matrix (memory_type: opi_opi); see https://docs.waveshare.com/ESP32-S3-RGB-Matrix
-extends = env:esp32S3_wroom2_32MB
-monitor_filters = esp32_exception_decoder
-build_unflags = ${env:esp32S3_wroom2_32MB.build_unflags}
-  -D WLED_RELEASE_NAME=\"ESP32-S3_WROOM-2_32MB\" ;; need to un-set the relese name before setting a new one
-build_flags = ${common.build_flags} ${esp32s3.build_flags} ${hub75.build_flags} ${hub75.s3_build_flags} ${hub75.i2s_disable_flags}
-  -D WLED_RELEASE_NAME=\"ESP32-S3_Waveshare_HUB75\"
-  -D WAVESHARE_S3_PINOUT
-;  -D WLED_USE_SD_SPI
-;  -D SD_PRINT_HOME_DIR
-;  -D WLED_DEBUG
-lib_deps = ${esp32s3.lib_deps}
-  ${hub75.lib_deps}
-
 [env:esp32s3dev_16MB_opi_hub75]
 ;; MOONHUB HUB75 adapter board (lilygo T7-S3 with 16MB flash and octal PSRAM)
 extends = env:esp32s3dev_8MB_opi
@@ -5,7 +5,7 @@
 # Please visit documentation: https://docs.platformio.org/page/projectconf.html

 [platformio]
-default_envs = WLED_generic8266_1M, esp32dev_dio80  # put the name(s) of your own build environment here. You can define as many as you need
+default_envs = WLED_generic8266_1M, esp32dev_V4_dio80  # put the name(s) of your own build environment here. You can define as many as you need

 #----------
 # SAMPLE
@@ -30,10 +30,7 @@ lib_deps = ${esp8266.lib_deps}
 ;  https://github.com/blazoncek/QuickESPNow.git#optional-debug  ;; exludes debug library

 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} ${esp8266.build_flags} -D WLED_RELEASE_NAME=\"ESP8266_generic_1M\"
-  -D WLED_DISABLE_PARTICLESYSTEM1D -D WLED_DISABLE_PARTICLESYSTEM2D
-  -D WLED_DISABLE_PIXELFORGE
-  -D WLED_DISABLE_OTA -D WLED_DISABLE_2D
+build_flags = ${common.build_flags} ${esp8266.build_flags}
 ;
 ; *** To use the below defines/overrides, copy and paste each onto its own line just below build_flags in the section above.
 ; *** Note: on adding custom usermods
@@ -192,7 +189,6 @@ build_flags = ${common.build_flags} ${esp8266.build_flags} -D WLED_RELEASE_NAME=
 ; configure I2C and SPI interface (for various hardware)
 ;   -D I2CSDAPIN=33 # initialise interface
 ;   -D I2CSCLPIN=35 # initialise interface
-;   # HW_PIN_* informs the WebUI about default pins - don't initialise interface
 ;   -D HW_PIN_SCL=35
 ;   -D HW_PIN_SDA=33
 ;   -D HW_PIN_CLOCKSPI=7
@@ -228,8 +224,7 @@ platform = ${esp8266.platform_wled_default}
 platform_packages = ${esp8266.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} ${esp8266.build_flags}  -D WLED_RELEASE_NAME=\"ESP8266_ESP07\" #-DWLED_DISABLE_2D
-  -D WLED_DISABLE_PARTICLESYSTEM2D
+build_flags = ${common.build_flags} ${esp8266.build_flags}
 lib_deps = ${esp8266.lib_deps}

 [env:d1_mini]
@@ -239,8 +234,7 @@ platform_packages = ${esp8266.platform_packages}
 upload_speed = 921600
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} ${esp8266.build_flags} -D WLED_RELEASE_NAME=\"ESP8266_D1MINI\" #-DWLED_DISABLE_2D
-  -D WLED_DISABLE_PARTICLESYSTEM2D
+build_flags = ${common.build_flags} ${esp8266.build_flags}
 lib_deps = ${esp8266.lib_deps}
 monitor_filters = esp8266_exception_decoder

@@ -250,8 +244,7 @@ platform = ${esp8266.platform_wled_default}
 platform_packages = ${esp8266.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} ${esp8266.build_flags} -D WLED_RELEASE_NAME=\"ESP8266_HT_D1MINI\" #-DWLED_DISABLE_2D
-  -D WLED_DISABLE_PARTICLESYSTEM2D
+build_flags = ${common.build_flags} ${esp8266.build_flags}
 lib_deps = ${esp8266.lib_deps}

 [env:h803wf]
@@ -260,24 +253,30 @@ platform = ${esp8266.platform_wled_default}
 platform_packages = ${esp8266.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} ${esp8266.build_flags} -D DATA_PINS=1 -D WLED_DISABLE_INFRARED  -D WLED_RELEASE_NAME=\"ESP8266_HT803WF\" #-DWLED_DISABLE_2D
-  -D WLED_DISABLE_PARTICLESYSTEM2D
+build_flags = ${common.build_flags} ${esp8266.build_flags} -D DATA_PINS=1 -D WLED_DISABLE_INFRARED
 lib_deps = ${esp8266.lib_deps}

 [env:esp32dev_qio80]
 extends = env:esp32dev  # we want to extend the existing esp32dev environment (and define only updated options)
 board = esp32dev
-build_flags = ${common.build_flags} ${esp32_idf_V4.build_flags} -D WLED_RELEASE_NAME=\"ESP32_qio80\" #-D WLED_DISABLE_BROWNOUT_DET
-lib_deps = ${esp32_idf_V4.lib_deps}
+build_flags = ${common.build_flags} ${esp32.build_flags} #-D WLED_DISABLE_BROWNOUT_DET
+lib_deps = ${esp32.lib_deps}
 monitor_filters = esp32_exception_decoder
 board_build.f_flash = 80000000L
 board_build.flash_mode = qio

-[env:esp32dev_dio80]
-extends = env:esp32dev_qio80          # we want to extend the previous environment, to change flash speed
-build_unflags = ${env:esp32dev_qio80.build_unflags} -D WLED_RELEASE_NAME=\"ESP32_qio80\"      # need to remove the previous WLED_RELEASE_NAME
-build_flags =   ${env:esp32dev_qio80.build_flags}   -D WLED_RELEASE_NAME=\"ESP32_dio80\"      # ... and then we can set a new one
-board_build.flash_mode = dio          # change flash mode to "dio", for boards that cannot not start with "qio" mode
+[env:esp32dev_V4_dio80]
+;; experimental ESP32 env using ESP-IDF V4.4.x
+;; Warning: this build environment is not stable!!
+;; please erase your device before installing.
+extends = esp32_idf_V4  # based on newer "esp-idf V4" platform environment
+board = esp32dev
+build_flags = ${common.build_flags}  ${esp32_idf_V4.build_flags} #-D WLED_DISABLE_BROWNOUT_DET
+lib_deps = ${esp32_idf_V4.lib_deps}
+monitor_filters = esp32_exception_decoder
+board_build.partitions = ${esp32.default_partitions}  ;; if you get errors about "out of program space", change this to ${esp32.extended_partitions} or even ${esp32.big_partitions}
+board_build.f_flash = 80000000L
+board_build.flash_mode = dio

 [env:esp32s2_saola]
 extends = esp32s2
@@ -287,19 +286,25 @@ platform_packages = ${esp32s2.platform_packages}
 framework = arduino
 board_build.flash_mode = qio
 upload_speed = 460800
-build_flags = ${common.build_flags} ${esp32s2.build_flags} -D WLED_RELEASE_NAME=\"ESP32-S2_saola\"
+build_flags = ${common.build_flags} ${esp32s2.build_flags}
  ;-DLOLIN_WIFI_FIX ;; try this in case Wifi does not work
  -DARDUINO_USB_CDC_ON_BOOT=1
 lib_deps = ${esp32s2.lib_deps}

+[env:esp32s3dev_8MB_PSRAM_qspi]
+;; ESP32-TinyS3 development board, with 8MB FLASH and PSRAM (memory_type: qio_qspi)
+extends = env:esp32s3dev_8MB_PSRAM_opi
+;board = um_tinys3 ;    -> needs workaround from https://github.com/wled-dev/WLED/pull/2905#issuecomment-1328049860
+board = esp32-s3-devkitc-1 ;; generic dev board; the next line adds PSRAM support
+board_build.arduino.memory_type = qio_qspi ;; use with PSRAM: 2MB or  4MB
+
 [env:esp8285_4CH_MagicHome]
 board = esp8285
 platform = ${esp8266.platform_wled_default}
 platform_packages = ${esp8266.platform_packages}
 board_build.ldscript = ${common.ldscript_1m128k}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} ${esp8266.build_flags} -D WLED_DISABLE_OTA  -D WLED_RELEASE_NAME=\"ESP8285_4CH_MagicHome\" #-DWLED_DISABLE_2D
-  -D WLED_DISABLE_PARTICLESYSTEM2D
+build_flags = ${common.build_flags} ${esp8266.build_flags} -D WLED_DISABLE_OTA
 lib_deps = ${esp8266.lib_deps}

 [env:esp8285_H801]
@@ -308,8 +313,7 @@ platform = ${esp8266.platform_wled_default}
 platform_packages = ${esp8266.platform_packages}
 board_build.ldscript = ${common.ldscript_1m128k}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} ${esp8266.build_flags} -D WLED_DISABLE_OTA  -D WLED_RELEASE_NAME=\"ESP8285_H801\" #-DWLED_DISABLE_2D
-  -D WLED_DISABLE_PARTICLESYSTEM2D
+build_flags = ${common.build_flags} ${esp8266.build_flags} -D WLED_DISABLE_OTA
 lib_deps = ${esp8266.lib_deps}

 [env:d1_mini_5CH_Shojo_PCB]
@@ -319,8 +323,6 @@ platform_packages = ${esp8266.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} ${esp8266.build_flags} -D WLED_USE_SHOJO_PCB ;; NB: WLED_USE_SHOJO_PCB is not used anywhere in the source code. Not sure why its needed.
-  -D WLED_RELEASE_NAME=\"ESP8266_5CH_Shojo_PCB\" #-DWLED_DISABLE_2D
-  -D WLED_DISABLE_PARTICLESYSTEM2D
 lib_deps = ${esp8266.lib_deps}

 [env:d1_mini_debug]
@@ -330,8 +332,7 @@ platform = ${esp8266.platform_wled_default}
 platform_packages = ${esp8266.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} ${esp8266.build_flags} ${common.debug_flags} -D WLED_RELEASE_NAME=\"ESP8266_D1MINI_DEBUG\" #-DWLED_DISABLE_2D
-  -D WLED_DISABLE_PARTICLESYSTEM2D
+build_flags = ${common.build_flags} ${esp8266.build_flags} ${common.debug_flags}
 lib_deps = ${esp8266.lib_deps}

 [env:d1_mini_ota]
@@ -343,8 +344,7 @@ platform = ${esp8266.platform_wled_default}
 platform_packages = ${esp8266.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} ${esp8266.build_flags} -D WLED_RELEASE_NAME=\"ESP8266_D1MINI_OTA\" #-DWLED_DISABLE_2D
-  -D WLED_DISABLE_PARTICLESYSTEM2D
+build_flags = ${common.build_flags} ${esp8266.build_flags}
 lib_deps = ${esp8266.lib_deps}

 [env:anavi_miracle_controller]
@@ -354,8 +354,6 @@ platform_packages = ${esp8266.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} ${esp8266.build_flags} -D DATA_PINS=12 -D IRPIN=-1 -D RLYPIN=2
-  -D WLED_RELEASE_NAME=\"ESP8266_ANAVI_MIRACLE\" #-DWLED_DISABLE_2D
-  -D WLED_DISABLE_PARTICLESYSTEM2D
 lib_deps = ${esp8266.lib_deps}

 [env:esp32c3dev_2MB]
@@ -366,7 +364,6 @@ platform = ${esp32c3.platform}
 platform_packages = ${esp32c3.platform_packages}
 board = esp32-c3-devkitm-1
 build_flags = ${common.build_flags} ${esp32c3.build_flags}
-  -D WLED_RELEASE_NAME=\"ESP32-C3_2MB\"
  -D WLED_WATCHDOG_TIMEOUT=0
  -D WLED_DISABLE_OTA
  ; -DARDUINO_USB_CDC_ON_BOOT=1 ;; for virtual CDC USB
@@ -415,14 +412,12 @@ board_build.f_flash = 80000000L
 [env:m5atom]
 extends = env:esp32dev  # we want to extend the existing esp32dev environment (and define only updated options)
 build_flags = ${common.build_flags} ${esp32.build_flags} -D DATA_PINS=27 -D BTNPIN=39
-  -D WLED_RELEASE_NAME=\"ESP32_m5atom\"

 [env:sp501e]
 board = esp_wroom_02
 platform = ${esp8266.platform_wled_default}
 board_build.ldscript = ${common.ldscript_2m512k}
 build_flags = ${common.build_flags} ${esp8266.build_flags} -D DATA_PINS=3 -D BTNPIN=1
-  -D WLED_RELEASE_NAME=\"ESP8266_sp501e\" -D WLED_DISABLE_PARTICLESYSTEM2D
 lib_deps = ${esp8266.lib_deps}

 [env:sp511e]
@@ -430,7 +425,6 @@ board = esp_wroom_02
 platform = ${esp8266.platform_wled_default}
 board_build.ldscript = ${common.ldscript_2m512k}
 build_flags = ${common.build_flags} ${esp8266.build_flags} -D DATA_PINS=3 -D BTNPIN=2 -D IRPIN=5 -D WLED_MAX_BUTTONS=3
-  -D WLED_RELEASE_NAME=\"ESP8266_sp511e\" -D WLED_DISABLE_PARTICLESYSTEM2D
 lib_deps = ${esp8266.lib_deps}

 [env:Athom_RGBCW]        ;7w and 5w(GU10) bulbs
@@ -440,8 +434,7 @@ platform_packages = ${esp8266.platform_packages}
 board_build.ldscript = ${common.ldscript_2m512k}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} ${esp8266.build_flags} -D BTNPIN=-1 -D RLYPIN=-1 -D DATA_PINS=4,12,14,13,5
-              -D LED_TYPES=TYPE_ANALOG_5CH -D WLED_DISABLE_INFRARED -D WLED_MAX_CCT_BLEND=0
-              -D WLED_RELEASE_NAME=\"ESP8285_Athom_RGBCW\" -D WLED_DISABLE_PARTICLESYSTEM2D
+                                            -D LED_TYPES=TYPE_ANALOG_5CH -D WLED_DISABLE_INFRARED -D WLED_MAX_CCT_BLEND=0
 lib_deps = ${esp8266.lib_deps}

 [env:Athom_15w_RGBCW]        ;15w bulb
@@ -451,8 +444,7 @@ platform_packages = ${esp8266.platform_packages}
 board_build.ldscript = ${common.ldscript_2m512k}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} ${esp8266.build_flags} -D BTNPIN=-1 -D RLYPIN=-1 -D DATA_PINS=4,12,14,5,13
-              -D LED_TYPES=TYPE_ANALOG_5CH -D WLED_DISABLE_INFRARED -D WLED_MAX_CCT_BLEND=0 -D WLED_USE_IC_CCT
-              -D WLED_RELEASE_NAME=\"ESP8285_Athom_15W_RGBCW\" -D WLED_DISABLE_PARTICLESYSTEM2D
+                                            -D LED_TYPES=TYPE_ANALOG_5CH -D WLED_DISABLE_INFRARED -D WLED_MAX_CCT_BLEND=0 -D WLED_USE_IC_CCT
 lib_deps = ${esp8266.lib_deps}

 [env:Athom_3Pin_Controller]        ;small controller with only data
@@ -462,7 +454,6 @@ platform_packages = ${esp8266.platform_packages}
 board_build.ldscript = ${common.ldscript_2m512k}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} ${esp8266.build_flags} -D BTNPIN=0 -D RLYPIN=-1 -D DATA_PINS=1 -D WLED_DISABLE_INFRARED
-              -D WLED_RELEASE_NAME=\"ESP8285_Athom_3Pin\" -D WLED_DISABLE_PARTICLESYSTEM2D
 lib_deps = ${esp8266.lib_deps}

 [env:Athom_4Pin_Controller]       ; With clock and data interface
@@ -472,7 +463,6 @@ platform_packages = ${esp8266.platform_packages}
 board_build.ldscript = ${common.ldscript_2m512k}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} ${esp8266.build_flags} -D BTNPIN=0 -D RLYPIN=12 -D DATA_PINS=1 -D WLED_DISABLE_INFRARED
-              -D WLED_RELEASE_NAME=\"ESP8285_Athom_4Pin\" -D WLED_DISABLE_PARTICLESYSTEM2D
 lib_deps = ${esp8266.lib_deps}

 [env:Athom_5Pin_Controller]      ;Analog light strip controller
@@ -482,7 +472,6 @@ platform_packages = ${esp8266.platform_packages}
 board_build.ldscript = ${common.ldscript_2m512k}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} ${esp8266.build_flags} -D BTNPIN=0 -D RLYPIN=-1 DATA_PINS=4,12,14,13 -D WLED_DISABLE_INFRARED
-              -D WLED_RELEASE_NAME=\"ESP8285_Athom_5Pin\" -D WLED_DISABLE_PARTICLESYSTEM2D
 lib_deps = ${esp8266.lib_deps}

 [env:MY9291]
@@ -492,7 +481,7 @@ platform_packages = ${esp8266.platform_packages}
 board_build.ldscript = ${common.ldscript_1m128k}
 build_unflags = ${common.build_unflags}
 custom_usermods = ${env:esp01_1m_full.custom_usermods} MY9291
-build_flags = ${common.build_flags} ${esp8266.build_flags} -D WLED_DISABLE_OTA -D WLED_RELEASE_NAME=\"ESP8266_MY9291\" -D WLED_DISABLE_PARTICLESYSTEM2D
+build_flags = ${common.build_flags} ${esp8266.build_flags} -D WLED_DISABLE_OTA
 lib_deps = ${esp8266.lib_deps}

 # ------------------------------------------------------------------------------
@@ -506,7 +495,7 @@ platform = ${esp8266.platform_wled_default}
 platform_packages = ${esp8266.platform_packages}
 board_build.ldscript = ${common.ldscript_2m512k}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} ${esp8266.build_flags} -D WLED_RELEASE_NAME=\"ESP8266_CODM06_2MB\" -D WLED_DISABLE_PARTICLESYSTEM2D
+build_flags = ${common.build_flags} ${esp8266.build_flags}
 lib_deps = ${esp8266.lib_deps}

 [env:codm-controller-0_6-rev2]
@@ -515,20 +504,47 @@ platform = ${esp8266.platform_wled_default}
 platform_packages = ${esp8266.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
-build_flags = ${common.build_flags} ${esp8266.build_flags}  -D WLED_RELEASE_NAME=\"ESP8266_CODM06R2_4MB\" -D WLED_DISABLE_PARTICLESYSTEM2D
+build_flags = ${common.build_flags} ${esp8266.build_flags}
 lib_deps = ${esp8266.lib_deps}

 # ------------------------------------------------------------------------------
 # EleksTube-IPS
-# See usermods/EleksTube_IPS/platformio_override.ini.sample
 # ------------------------------------------------------------------------------
+[env:elekstube_ips]
+extends = esp32              ;; use default esp32 platform
+board = esp32dev
+upload_speed = 921600
+custom_usermods = ${env:esp32dev.custom_usermods} RTC EleksTube_IPS
+build_flags = ${common.build_flags} ${esp32.build_flags} -D WLED_DISABLE_BROWNOUT_DET -D WLED_DISABLE_INFRARED
+  -D DATA_PINS=12
+  -D RLYPIN=27
+  -D BTNPIN=34
+  -D PIXEL_COUNTS=6
+  # Display config
+  -D ST7789_DRIVER
+  -D TFT_WIDTH=135
+  -D TFT_HEIGHT=240
+  -D CGRAM_OFFSET
+  -D TFT_SDA_READ
+  -D TFT_MOSI=23
+  -D TFT_SCLK=18
+  -D TFT_DC=25
+  -D TFT_RST=26
+  -D SPI_FREQUENCY=40000000
+  -D USER_SETUP_LOADED
+monitor_filters = esp32_exception_decoder


 # ------------------------------------------------------------------------------
 # Usermod examples
 # ------------------------------------------------------------------------------

-# 433MHz RF remote example: see usermods/usermod_v2_RF433/platformio_override.ini.sample
+# 433MHz RF remote example for esp32dev
+[env:esp32dev_usermod_RF433]
+extends = env:esp32dev
+custom_usermods =
+  ${env:esp32dev.custom_usermods}
+  RF433

 # External usermod from a git repository.
 # The library's `library.json` must include `"build": {"libArchive": false}`.
@@ -7,97 +7,81 @@
  <a href="https://kno.wled.ge"><img src="https://img.shields.io/badge/quick_start-wiki-blue.svg?style=flat-square"></a>
  <a href="https://github.com/Aircoookie/WLED-App"><img src="https://img.shields.io/badge/app-wled-blue.svg?style=flat-square"></a>
  <a href="https://gitpod.io/#https://github.com/wled-dev/WLED"><img src="https://img.shields.io/badge/Gitpod-ready--to--code-blue?style=flat-square&logo=gitpod"></a>
-</p>
+
+  </p>

 # Welcome to WLED! ✨

-A fast and feature-rich firmware for ESP32 microcontrollers to control addressable LEDs — from simple strips to large 2D matrices and HUB75 panels.
+A fast and feature-rich implementation of an ESP32 and ESP8266 webserver to control NeoPixel (WS2812B, WS2811, SK6812) LEDs or also SPI based chipsets like the WS2801 and APA102!

-Originally created by [Aircoookie](https://github.com/Aircoookie), now maintained by a community of contributors.
+Originally created by [Aircoookie](https://github.com/Aircoookie)

 ## ⚙️ Features
+- WS2812FX library with more than 100 special effects  
+- FastLED noise effects and 50 palettes  
+- Modern UI with color, effect and segment controls  
+- Segments to set different effects and colors to user defined parts of the LED string  
+- Settings page - configuration via the network  
+- Access Point and station mode - automatic failsafe AP  
+- [Up to 10 LED outputs](https://kno.wled.ge/features/multi-strip/#esp32) per instance
+- Support for RGBW strips  
+- Up to 250 user presets to save and load colors/effects easily, supports cycling through them.  
+- Presets can be used to automatically execute API calls  
+- Nightlight function (gradually dims down)  
+- Full OTA software updateability (HTTP + ArduinoOTA), password protectable  
+- Configurable analog clock (Cronixie, 7-segment and EleksTube IPS clock support via usermods) 
+- Configurable Auto Brightness limit for safe operation  
+- Filesystem-based config for easier backup of presets and settings  

-### Effects & Visuals
- [**200+ built-in effects**](https://kno.wled.ge/features/effects/) including classic animations, audio-reactive, and 2D/matrix effects
- [50+ color palettes](https://kno.wled.ge/features/palettes/) plus a built-in **custom palette editor** (PixelForge)
- [**2D LED matrix support**](https://kno.wled.ge/advanced/mapping/) with dedicated 2D effects and flexible panel mapping
- [**HUB75 RGB matrix panel support**](https://kno.wled.ge/advanced/HUB75/) (ESP32)
- [**AudioReactive**](https://kno.wled.ge/advanced/audio-reactive/) effects — included by default, responding to sound via microphone, line-in, or network audio source
- Effect blending for smooth transitions between animations
- Antialiased drawing functions for smooth graphics
-
-### Segments & Control
- [**Segments**](https://kno.wled.ge/features/segments/) — apply different effects, colors and palettes to independent parts of your LED setup simultaneously
- Up to **250 presets** to save and recall colors, effects and segment configurations — supports [playlists](https://kno.wled.ge/features/presets/) for automated cycling
- Nightlight function with configurable dimming curve
- Configurable **Auto Brightness Limiter** (per output) for safe operation
-
-### Hardware Support
- **ESP32** (all variants: original, S2, S3, C3)
- [**Up to 17 LED outputs**](https://kno.wled.ge/features/multi-strip/) on ESP32 using parallel I2S + RMT
- [Addressable LED support](https://kno.wled.ge/basics/compatible-led-strips/): WS2812B, WS2811, WS2815, SK6812, WS2805, TM1914, APA102, WS2801, LPD8806, and many more
- RGBW, [RGB+CCT](https://kno.wled.ge/features/cct/) and white-only strips
- PWM outputs for analog LEDs and dimmers
- [**Ethernet** support](https://kno.wled.ge/features/ethernet-lan/) for a wide range of boards (QuinLED, LILYGO, Olimex, and more)
- Filesystem-based config for easy backup and restore of presets and settings
- Full OTA firmware updates (HTTP + ArduinoOTA), password-protectable
-
-### Connectivity & Integrations
- **WLED app** for [Android](https://play.google.com/store/apps/details?id=ca.cgagnier.wlednativeandroid) and [iOS](https://apps.apple.com/gb/app/wled-native/id6446207239)
- [JSON](https://kno.wled.ge/interfaces/json-api/) and [HTTP request](https://kno.wled.ge/interfaces/http-api/) APIs
- **Multi-WiFi** — connect to up to 3 networks with automatic AP fallback
- **ESP-NOW** wireless sync between devices (no WiFi router required)
- [**MQTT**](https://kno.wled.ge/interfaces/mqtt/) with Home Assistant discovery
- [**E1.31, Art-Net**](https://kno.wled.ge/interfaces/e1.31-dmx/), [DDP](https://kno.wled.ge/interfaces/ddp/) and [TPM2.net](https://kno.wled.ge/interfaces/udp-realtime/) for DMX/professional lighting control
- [UDP realtime sync](https://kno.wled.ge/interfaces/udp-notifier/) across multiple WLED devices
- Alexa voice control (on/off, brightness, color)
- [Philips Hue sync](https://kno.wled.ge/interfaces/philips-hue/)
- [diyHue](https://github.com/diyhue/diyHue) and [Hyperion](https://github.com/hyperion-project/hyperion.ng) integration
- [Adalight / TPM2](https://kno.wled.ge/interfaces/serial/) (PC ambilight via serial)
- [Infrared remote control](https://kno.wled.ge/interfaces/infrared/) (24-key RGB, receiver required)
- Timers and schedules (NTP time sync, full timezone and DST support)
-
-### Developer-Friendly
- **Usermod system** — extend WLED with community or custom modules without modifying core code
- Large and active [usermod library](https://kno.wled.ge/advanced/community-usermods/) including AudioReactive, temperature sensors, rotary encoders, displays, and much more
- Well-documented [JSON API](https://kno.wled.ge/interfaces/json-api/)
- Licensed under the **EUPL v1.2**
+## 💡 Supported light control interfaces
+- WLED app for [Android](https://play.google.com/store/apps/details?id=ca.cgagnier.wlednativeandroid) and [iOS](https://apps.apple.com/gb/app/wled-native/id6446207239)
+- JSON and HTTP request APIs  
+- MQTT   
+- E1.31, Art-Net, DDP and TPM2.net
+- [diyHue](https://github.com/diyhue/diyHue) (Wled is supported by diyHue, including Hue Sync Entertainment under udp. Thanks to [Gregory Mallios](https://github.com/gmallios))
+- [Hyperion](https://github.com/hyperion-project/hyperion.ng)
+- UDP realtime  
+- Alexa voice control (including dimming and color)  
+- Sync to Philips hue lights  
+- Adalight (PC ambilight via serial) and TPM2  
+- Sync color of multiple WLED devices (UDP notifier)  
+- Infrared remotes (24-key RGB, receiver required)  
+- Simple timers/schedules (time from NTP, timezones/DST supported)  

 ## 📲 Quick start guide and documentation

-See the [documentation at kno.wled.ge](https://kno.wled.ge)!
+See the [documentation on our official site](https://kno.wled.ge)!

-[Tutorials and getting-started guides](https://kno.wled.ge/basics/tutorials/) to help you get your project running quickly.
+[On this page](https://kno.wled.ge/basics/tutorials/) you can find excellent tutorials and tools to help you get your new project up and running!

 ## 🖼️ User interface
-
 <img src="/images/macbook-pro-space-gray-on-the-wooden-table.jpg" width="50%"><img src="/images/walking-with-iphone-x.jpg" width="50%">

 ## 💾 Compatible hardware

-See the [compatible hardware list](https://kno.wled.ge/basics/compatible-hardware) on the wiki.
+See [here](https://kno.wled.ge/basics/compatible-hardware)!

 ## ✌️ Other

-Licensed under the [EUPL v1.2](https://raw.githubusercontent.com/wled-dev/WLED/main/LICENSE).  
-Credits to all [contributors](https://kno.wled.ge/about/contributors/)!  
-CORS proxy by [Corsfix](https://corsfix.com/).
+Licensed under the EUPL v1.2 license  
+Credits [here](https://kno.wled.ge/about/contributors/)!
+CORS proxy by [Corsfix](https://corsfix.com/)

 Join the Discord server to discuss everything about WLED!

 <a href="https://discord.gg/QAh7wJHrRM"><img src="https://discordapp.com/api/guilds/473448917040758787/widget.png?style=banner2" width="25%"></a>

-Check out the WLED [Discourse forum](https://wled.discourse.group)!
+Check out the WLED [Discourse forum](https://wled.discourse.group)!  

-If you'd like to reach the original creator privately: [dev.aircoookie@gmail.com](mailto:dev.aircoookie@gmail.com).
+You can also send me mails to [dev.aircoookie@gmail.com](mailto:dev.aircoookie@gmail.com), but please, only do so if you want to talk to me privately.  

-If WLED brightens up your day, you can [send a gift to Aircoookie via PayPal](https://paypal.me/aircoookie).
+If WLED really brightens up your day, you can [![](https://img.shields.io/badge/send%20me%20a%20small%20gift-paypal-blue.svg?style=flat-square)](https://paypal.me/aircoookie)

---

-*Disclaimer:*
+*Disclaimer:*   

-If you are prone to photosensitive epilepsy, we recommend you do **not** use this software.  
-If you still want to try, avoid strobe, lightning or noise modes and high effect speed settings.
+If you are prone to photosensitive epilepsy, we recommended you do **not** use this software.  
+If you still want to try, don't use strobe, lighting or noise modes or high effect speed settings.
+
+As per the EUPL license, I assume no liability for any damage to you or any other person or equipment.  

-As per the EUPL license, no liability is assumed for any damage to you or any other person or equipment.
@@ -28,19 +28,18 @@ class ADS1115Usermod : public Usermod {
    }

    void loop() {
-      if (!isEnabled || strip.isUpdating() || millis() - lastTime <= loopInterval)
-        return;
+      if (isEnabled && millis() - lastTime > loopInterval) {
+        lastTime = millis();

-      lastTime = millis();
+        // If we don't have new data, skip this iteration.
+        if (!ads.conversionComplete()) {
+          return;
+        }

-      // If we don't have new data, skip this iteration.
-      if (!ads.conversionComplete()) {
-        return;
+        updateResult();
+        moveToNextChannel();
+        startReading();
      }
-
-      updateResult();
-      moveToNextChannel();
-      startReading();
    }

    void addToJsonInfo(JsonObject& root)
@@ -70,8 +69,6 @@ class ADS1115Usermod : public Usermod {
    {
      JsonObject top = root.createNestedObject(F("ADC ADS1115"));
      
-      top[F("Loop Interval")] = loopInterval;
-
      for (uint8_t i = 0; i < channelsCount; i++) {
        ChannelSettings* settingsPtr = &(channelSettings[i]);
        JsonObject channel = top.createNestedObject(settingsPtr->settingName);
@@ -82,6 +79,8 @@ class ADS1115Usermod : public Usermod {
        channel[F("Offset")] = settingsPtr->offset;
        channel[F("Decimals")] = settingsPtr->decimals;
      }
+
+      top[F("Loop Interval")] = loopInterval;
    }

    bool readFromConfig(JsonObject& root)
@@ -2,7 +2,7 @@
  "name": "ADS1115_v2",
  "build": { "libArchive": false },
  "dependencies": {
-    "Adafruit BusIO": "https://github.com/adafruit/Adafruit_BusIO#1.17.4",
-    "Adafruit ADS1X15": "https://github.com/adafruit/Adafruit_ADS1X15#2.6.2"
+    "Adafruit BusIO": "https://github.com/adafruit/Adafruit_BusIO#1.13.2",
+    "Adafruit ADS1X15": "https://github.com/adafruit/Adafruit_ADS1X15#2.4.0"
  }
 }
@@ -1,29 +1,10 @@
-# ADS1115 Usermod
+# ADS1115 16-Bit ADC with four inputs

-Reads values from an ADS1115 16-bit ADC and exposes them in the `Info` tab.
+This usermod will read from an ADS1115 ADC. The voltages are displayed in the Info section of the web UI.

-## Features
- Reads values from an ADS1115 over I2C.
- Supports 8 ADS1115 input modes:
-	- 4 single-ended inputs (`AIN0` to `AIN3`)
-	- 4 differential pairs (`AIN0-AIN1`, `AIN0-AIN3`, `AIN1-AIN3`, `AIN2-AIN3`)
- Per-channel configuration in the Usermod settings:
-	- Enable/disable
-	- Display name
-	- Units
-	- Multiplier and offset
-	- Decimal precision
- Configurable measurement loop interval.
- Publishes configured channel values to the `Info` tab.
+Configuration is performed via the Usermod menu. There are no parameters to set in code!

-## Compatibility
- Requires an ADS1115 module connected via I2C.
- Works on targets with I2C support.
- Default ADC gain is `1x` (input range `+/-4.096V`).
+## Installation 

-## Installation
- Add `ADS1115` to `custom_usermods` in your `platformio.ini` (or `platformio_override.ini`).
-
-## Author
- Dima Zhemkov [@dima-zhemkov](https://github.com/dima-zhemkov)
+Add 'ADS1115' to `custom_usermods` in your platformio environment.

@@ -0,0 +1,5 @@
+[env:aht10_example]
+extends = env:esp32dev
+build_flags =
+  ${common.build_flags} ${esp32.build_flags}
+  ; -D USERMOD_AHT10_DEBUG ; -- add a debug status to the info modal
@@ -25,8 +25,6 @@ class Animated_Staircase : public Usermod {
    unsigned int topMaxDist        = 50;    // default maximum measured distance in cm, top
    unsigned int bottomMaxDist     = 50;    // default maximum measured distance in cm, bottom
    bool togglePower               = false; // toggle power on/off with staircase on/off
-    bool topAPinInvert             = false; // invert output of top sensor
-    bool bottomAPinInvert          = false; // invert output of bottom sensor

    /* runtime variables */
    bool initDone = false;
@@ -93,8 +91,6 @@ class Animated_Staircase : public Usermod {
    static const char _topEchoCm[];
    static const char _bottomEchoCm[];
    static const char _togglePower[];
-    static const char _topPIRorTrigger_pin_invert[];
-    static const char _bottomPIRorTrigger_pin_invert[];

    void publishMqtt(bool bottom, const char* state) {
 #ifndef WLED_DISABLE_MQTT
@@ -160,12 +156,6 @@ class Animated_Staircase : public Usermod {
      return pulseIn(echoPin, HIGH, maxTimeUs) > 0;
    }

-    bool readPIRPin(int8_t pin, bool invert) {
-      if (pin < 0) return false;
-        bool v = digitalRead(pin);
-      return invert ? !v : v;
-    }
-
    bool checkSensors() {
      bool sensorChanged = false;

@@ -174,15 +164,15 @@ class Animated_Staircase : public Usermod {

        bottomSensorRead = bottomSensorWrite ||
          (!useUSSensorBottom ?
-            (bottomPIRorTriggerPin<0 ? false : readPIRPin(bottomPIRorTriggerPin, bottomAPinInvert)) :
+            (bottomPIRorTriggerPin<0 ? false : digitalRead(bottomPIRorTriggerPin)) :
            ultrasoundRead(bottomPIRorTriggerPin, bottomEchoPin, bottomMaxDist*59)  // cm to us
          );
        topSensorRead = topSensorWrite ||
          (!useUSSensorTop ?
-            (topPIRorTriggerPin<0 ? false : readPIRPin(topPIRorTriggerPin, topAPinInvert)) :
+            (topPIRorTriggerPin<0 ? false : digitalRead(topPIRorTriggerPin)) :
            ultrasoundRead(topPIRorTriggerPin, topEchoPin, topMaxDist*59)   // cm to us
          );
-     
+
        if (bottomSensorRead != bottomSensorState) {
          bottomSensorState = bottomSensorRead; // change previous state
          sensorChanged = true;
@@ -449,20 +439,18 @@ class Animated_Staircase : public Usermod {
      if (staircase.isNull()) {
        staircase = root.createNestedObject(FPSTR(_name));
      }
-      staircase[FPSTR(_enabled)]                       = enabled;
-      staircase[FPSTR(_segmentDelay)]                  = segment_delay_ms;
-      staircase[FPSTR(_onTime)]                        = on_time_ms / 1000;
-      staircase[FPSTR(_useTopUltrasoundSensor)]        = useUSSensorTop;
-      staircase[FPSTR(_topPIRorTrigger_pin)]           = topPIRorTriggerPin;
-      staircase[FPSTR(_topEcho_pin)]                   = useUSSensorTop ? topEchoPin : -1;
-      staircase[FPSTR(_useBottomUltrasoundSensor)]     = useUSSensorBottom;
-      staircase[FPSTR(_bottomPIRorTrigger_pin)]        = bottomPIRorTriggerPin;
-      staircase[FPSTR(_bottomEcho_pin)]                = useUSSensorBottom ? bottomEchoPin : -1;
-      staircase[FPSTR(_topEchoCm)]                     = topMaxDist;
-      staircase[FPSTR(_bottomEchoCm)]                  = bottomMaxDist;
-      staircase[FPSTR(_togglePower)]                   = togglePower;
-      staircase[FPSTR(_topPIRorTrigger_pin_invert)]    = topAPinInvert;
-      staircase[FPSTR(_bottomPIRorTrigger_pin_invert)] = bottomAPinInvert;
+      staircase[FPSTR(_enabled)]                   = enabled;
+      staircase[FPSTR(_segmentDelay)]              = segment_delay_ms;
+      staircase[FPSTR(_onTime)]                    = on_time_ms / 1000;
+      staircase[FPSTR(_useTopUltrasoundSensor)]    = useUSSensorTop;
+      staircase[FPSTR(_topPIRorTrigger_pin)]       = topPIRorTriggerPin;
+      staircase[FPSTR(_topEcho_pin)]               = useUSSensorTop ? topEchoPin : -1;
+      staircase[FPSTR(_useBottomUltrasoundSensor)] = useUSSensorBottom;
+      staircase[FPSTR(_bottomPIRorTrigger_pin)]    = bottomPIRorTriggerPin;
+      staircase[FPSTR(_bottomEcho_pin)]            = useUSSensorBottom ? bottomEchoPin : -1;
+      staircase[FPSTR(_topEchoCm)]                 = topMaxDist;
+      staircase[FPSTR(_bottomEchoCm)]              = bottomMaxDist;
+      staircase[FPSTR(_togglePower)]               = togglePower;
      DEBUG_PRINTLN(F("Staircase config saved."));
    }

@@ -474,13 +462,11 @@ class Animated_Staircase : public Usermod {
    bool readFromConfig(JsonObject& root) {
      bool oldUseUSSensorTop = useUSSensorTop;
      bool oldUseUSSensorBottom = useUSSensorBottom;
-      bool oldTopAPinInvert = topAPinInvert;
-      bool oldBottomAPinInvert = bottomAPinInvert;
      int8_t oldTopAPin = topPIRorTriggerPin;
      int8_t oldTopBPin = topEchoPin;
      int8_t oldBottomAPin = bottomPIRorTriggerPin;
      int8_t oldBottomBPin = bottomEchoPin;
-     
+
      JsonObject top = root[FPSTR(_name)];
      if (top.isNull()) {
        DEBUG_PRINT(FPSTR(_name));
@@ -499,12 +485,10 @@ class Animated_Staircase : public Usermod {
      useUSSensorTop     = top[FPSTR(_useTopUltrasoundSensor)] | useUSSensorTop;
      topPIRorTriggerPin = top[FPSTR(_topPIRorTrigger_pin)] | topPIRorTriggerPin;
      topEchoPin         = top[FPSTR(_topEcho_pin)] | topEchoPin;
-      topAPinInvert      = top[FPSTR(_topPIRorTrigger_pin_invert)] | topAPinInvert;
-     
+
      useUSSensorBottom     = top[FPSTR(_useBottomUltrasoundSensor)] | useUSSensorBottom;
      bottomPIRorTriggerPin = top[FPSTR(_bottomPIRorTrigger_pin)] | bottomPIRorTriggerPin;
      bottomEchoPin         = top[FPSTR(_bottomEcho_pin)] | bottomEchoPin;
-      bottomAPinInvert      = top[FPSTR(_bottomPIRorTrigger_pin_invert)] | bottomAPinInvert;

      topMaxDist    = top[FPSTR(_topEchoCm)] | topMaxDist;
      topMaxDist    = min(150,max(30,(int)topMaxDist));     // max distance ~1.5m (a lag of 9ms may be expected)
@@ -570,15 +554,14 @@ const char Animated_Staircase::_segmentDelay[]              PROGMEM = "segment-d
 const char Animated_Staircase::_onTime[]                    PROGMEM = "on-time-s";
 const char Animated_Staircase::_useTopUltrasoundSensor[]    PROGMEM = "useTopUltrasoundSensor";
 const char Animated_Staircase::_topPIRorTrigger_pin[]       PROGMEM = "topPIRorTrigger_pin";
-const char Animated_Staircase::_topPIRorTrigger_pin_invert[]    PROGMEM = "topPIRorTrigger_pin_invert";
 const char Animated_Staircase::_topEcho_pin[]               PROGMEM = "topEcho_pin";
 const char Animated_Staircase::_useBottomUltrasoundSensor[] PROGMEM = "useBottomUltrasoundSensor";
 const char Animated_Staircase::_bottomPIRorTrigger_pin[]    PROGMEM = "bottomPIRorTrigger_pin";
-const char Animated_Staircase::_bottomPIRorTrigger_pin_invert[] PROGMEM = "bottomPIRorTrigger_pin_invert";
 const char Animated_Staircase::_bottomEcho_pin[]            PROGMEM = "bottomEcho_pin";
 const char Animated_Staircase::_topEchoCm[]                 PROGMEM = "top-dist-cm";
 const char Animated_Staircase::_bottomEchoCm[]              PROGMEM = "bottom-dist-cm";
 const char Animated_Staircase::_togglePower[]               PROGMEM = "toggle-on-off";

+
 static Animated_Staircase animated_staircase;
 REGISTER_USERMOD(animated_staircase);
@@ -8,13 +8,13 @@
 ; USERMOD_DHT_MQTT                 - publish measurements to the MQTT broker
 ; USERMOD_DHT_STATS                - For debug, report delay stats

-[env:esp8266_2m_usermod_dht_C]
-extends = env:esp8266_2m
-custom_usermods = ${env:esp8266_2m.custom_usermods} DHT
-build_flags = ${env:esp8266_2m.build_flags} -D USERMOD_DHT_CELSIUS
+[env:d1_mini_usermod_dht_C]
+extends = env:d1_mini
+custom_usermods = ${env:d1_mini.custom_usermods} DHT
+build_flags = ${env:d1_mini.build_flags} -D USERMOD_DHT_CELSIUS

-[env:esp32dev_LEDPIN_16_usermod_dht_C]
-extends = env:esp32dev
-custom_usermods = ${env:esp32dev.custom_usermods} DHT
-build_flags = ${env:esp32dev.build_flags} -D LEDPIN=16 -D USERMOD_DHT_CELSIUS -D USERMOD_DHT_STATS
+[env:custom32_LEDPIN_16_usermod_dht_C]
+extends = env:custom32_LEDPIN_16
+custom_usermods = ${env:custom32_LEDPIN_16.custom_usermods} DHT
+build_flags = ${env:custom32_LEDPIN_16.build_flags} -D USERMOD_DHT_CELSIUS -D USERMOD_DHT_STATS

@@ -0,0 +1,6 @@
+[env:ina226_example]
+extends = env:esp32dev
+custom_usermods = ${env:esp32dev.custom_usermods} INA226_v2
+build_flags =
+  ${env:esp32dev.build_flags}
+  ; -D USERMOD_INA226_DEBUG ; -- add a debug status to the info modal
@@ -1,5 +1,6 @@
 ; Options
 ; -------
+; USERMOD_SN_PHOTORESISTOR                      - define this to have this user mod included wled00\usermods_list.cpp
 ; USERMOD_SN_PHOTORESISTOR_MEASUREMENT_INTERVAL - the number of milliseconds between measurements, defaults to 60 seconds
 ; USERMOD_SN_PHOTORESISTOR_FIRST_MEASUREMENT_AT - the number of milliseconds after boot to take first measurement, defaults to 20 seconds
 ; USERMOD_SN_PHOTORESISTOR_REFERENCE_VOLTAGE    - the voltage supplied to the sensor, defaults to 5v
@@ -7,10 +8,9 @@
 ; USERMOD_SN_PHOTORESISTOR_RESISTOR_VALUE       - the resistor size, defaults to 10000.0 (10K hms)
 ; USERMOD_SN_PHOTORESISTOR_OFFSET_VALUE         - the offset value to report on, defaults to 25
 ;
-[env:usermod_sn_photoresistor_esp8266_2m]
-extends = env:esp8266_2m
-custom_usermods = ${env:esp8266_2m.custom_usermods} SN_Photoresistor
+[env:usermod_sn_photoresistor_d1_mini]
+extends = env:d1_mini
 build_flags =
-    ${env:esp8266_2m.build_flags}
-    -D USERMOD_SN_PHOTORESISTOR_MEASUREMENT_INTERVAL=60
-lib_deps = ${env:esp8266_2m.lib_deps}
+    ${common.build_flags_esp8266}
+    -D USERMOD_SN_PHOTORESISTOR
+lib_deps = ${env.lib_deps}
@@ -0,0 +1,8 @@
+[env:esp32dev]
+build_flags = ${common.build_flags_esp32} 
+; PIN defines - uncomment and change, if needed:
+;  -D LEDPIN=2
+   -D BTNPIN=35
+;  -D IRPIN=4
+;  -D RLYPIN=12
+;  -D RLYMDE=1
@@ -0,0 +1,5 @@
+; Options
+; -------
+; USERMOD_DALLASTEMPERATURE_MEASUREMENT_INTERVAL - the number of milliseconds between measurements, defaults to 60 seconds
+;
+
@@ -13,7 +13,7 @@ board_build.partitions = ${esp32.large_partitions}
 board_build.f_flash = 80000000L
 board_build.flash_mode = qio
 monitor_filters = esp32_exception_decoder
-build_flags = ${common.build_flags} ${esp32s3.build_flags} -D WLED_RELEASE_NAME=\"T-QT-PRO-8MB_dice\"
+build_flags = ${common.build_flags} ${esp32s3.build_flags} -D WLED_RELEASE_NAME=T-QT-PRO-8MB
  -D CONFIG_LITTLEFS_FOR_IDF_3_2 -D WLED_WATCHDOG_TIMEOUT=0
  -D ARDUINO_USB_CDC_ON_BOOT=1 -D ARDUINO_USB_MODE=1      ;; for boards with USB-OTG connector only (USBCDC or "TinyUSB")
  
@@ -75,7 +75,7 @@ board_build.partitions = ${esp32.large_partitions}
 board_build.f_flash = 80000000L
 board_build.flash_mode = qio
 monitor_filters = esp32_exception_decoder
-build_flags = ${common.build_flags} ${esp32s3.build_flags} -D WLED_RELEASE_NAME=\"ESP32-S3_8MB_qspi_dice\"
+build_flags = ${common.build_flags} ${esp32s3.build_flags} -D WLED_RELEASE_NAME=ESP32-S3_8MB_qspi
  -D CONFIG_LITTLEFS_FOR_IDF_3_2 -D WLED_WATCHDOG_TIMEOUT=0
  -D ARDUINO_USB_CDC_ON_BOOT=1 -D ARDUINO_USB_MODE=1      ;; for boards with USB-OTG connector only (USBCDC or "TinyUSB")
  
@@ -105,7 +105,7 @@ lib_deps = ${esp32s3.lib_deps}
 # https://github.com/wled-dev/WLED/issues/1382
 ; [env:esp32dev_dice]
 ; extends = env:esp32dev
-; build_flags = ${common.build_flags} ${esp32.build_flags} -D WLED_RELEASE_NAME=\"ESP32_dice\"
+; build_flags = ${common.build_flags} ${esp32.build_flags} -D WLED_RELEASE_NAME=ESP32
 ;   ; Enable Pixels dice mod
 ;   -D USERMOD_PIXELS_DICE_TRAY
 ; lib_deps = ${esp32.lib_deps}
@@ -143,13 +143,7 @@ void ShtUsermod::appendDeviceToMqttDiscoveryMessage(JsonDocument& root) {
  device[F("ids")] = escapedMac.c_str();
  device[F("name")] = serverDescription;
  device[F("sw")] = versionString;
-  // AI: below section was generated by an AI
-  #ifdef ARDUINO_ARCH_ESP32
  device[F("mdl")] = ESP.getChipModel();
-  #else
-  device[F("mdl")] = F("ESP8266");
-  #endif
-  // AI: end
  device[F("mf")] = F("espressif");
 }

@@ -2,10 +2,10 @@
 default_envs = esp32dev_fld

 [env:esp32dev_fld]
-extends = env:esp32dev
-custom_usermods = ${env:esp32dev.custom_usermods} four_line_display_ALT
+extends = env:esp32dev_V4
+custom_usermods = ${env:esp32dev_V4.custom_usermods} four_line_display_ALT
 build_flags =
-    ${env:esp32dev.build_flags}
+    ${env:esp32dev_V4.build_flags}
    -D FLD_TYPE=SH1106
    -D I2CSCLPIN=27
    -D I2CSDAPIN=26
@@ -2,10 +2,10 @@
 default_envs = esp32dev_re

 [env:esp32dev_re]
-extends = env:esp32dev
-custom_usermods = ${env:esp32dev.custom_usermods} rotary_encoder_ui_ALT
+extends = env:esp32dev_V4
+custom_usermods = ${env:esp32dev_V4.custom_usermods} rotary_encoder_ui_ALT
 build_flags =
-    ${env:esp32dev.build_flags}
+    ${env:esp32dev_V4.build_flags}
    -D USERMOD_ROTARY_ENCODER_GPIO=INPUT
    -D ENCODER_DT_PIN=21
    -D ENCODER_CLK_PIN=23
@@ -1061,7 +1061,7 @@ void mode_traffic_light(void) {
      case 0: SEGMENT.setPixelColor(i, 0x00FF0000); mdelay = 150 + (100 * (uint32_t)(255 - SEGMENT.speed));break;
      case 1: SEGMENT.setPixelColor(i, 0x00FF0000); mdelay = 150 + (20 * (uint32_t)(255 - SEGMENT.speed)); SEGMENT.setPixelColor(i+1, 0x00EECC00); break;
      case 2: SEGMENT.setPixelColor(i+2, 0x0000FF00); mdelay = 150 + (100 * (uint32_t)(255 - SEGMENT.speed));break;
-      case 3: SEGMENT.setPixelColor(i+1, gamma32inv(0x00EECC00)); mdelay = 150 + (20 * (uint32_t)(255 - SEGMENT.speed));break; // gamma inversion to restore original pre 16.0 looks
+      case 3: SEGMENT.setPixelColor(i+1, 0x00EECC00); mdelay = 150 + (20 * (uint32_t)(255 - SEGMENT.speed));break;
    }
  }

@@ -4182,14 +4182,14 @@ void mode_pacifica()
  uint32_t nowOld = strip.now;

  CRGBPalette16 pacifica_palette_1 =
-    { 0x002229, 0x001E2F, 0x001934, 0x001938, 0x00143F, 0x001443, 0x00B047, 0x00B04C,  // note: palettes are gamma inverted using gamma 2.0 to get closer to pre 16.0 looks
-      0x00004F, 0x000054, 0x000062, 0x00006F, 0x00007A, 0x000085, 0x47938A, 0x64D08E };
+    { 0x000507, 0x000409, 0x00030B, 0x00030D, 0x000210, 0x000212, 0x000114, 0x000117,
+      0x000019, 0x00001C, 0x000026, 0x000031, 0x00003B, 0x000046, 0x14554B, 0x28AA50 };
  CRGBPalette16 pacifica_palette_2 =
-    { 0x002229, 0x001E2F, 0x001934, 0x001938, 0x00143F, 0x001443, 0x00B047, 0x00B04C,
-      0x00004F, 0x000054, 0x000062, 0x00006F, 0x00007A, 0x000085, 0x369B90, 0x4FDC9B };
+    { 0x000507, 0x000409, 0x00030B, 0x00030D, 0x000210, 0x000212, 0x000114, 0x000117,
+      0x000019, 0x00001C, 0x000026, 0x000031, 0x00003B, 0x000046, 0x0C5F52, 0x19BE5F };
  CRGBPalette16 pacifica_palette_3 =
-    { 0x00142C, 0x00193B, 0x002247, 0x002551, 0x002C5A, 0x002F63, 0x00346B, 0x003671,
-      0x003B78, 0x003F7F, 0x00478E, 0x004D9C, 0x0054A9, 0x005AB4, 0x3F7FDC, 0x5A9CFF };
+    { 0x000208, 0x00030E, 0x000514, 0x00061A, 0x000820, 0x000927, 0x000B2D, 0x000C33,
+      0x000E39, 0x001040, 0x001450, 0x001860, 0x001C70, 0x002080, 0x1040BF, 0x2060FF };

  if (SEGMENT.palette) {
    pacifica_palette_1 = SEGPALETTE;
@@ -4240,10 +4240,10 @@ void mode_pacifica()
      c += CRGB(overage, overage2, qadd8(overage2, overage2));
    }

-    //deepen the blues and greens  note: no longer needed with proper gamma in 16.0
-    //c.blue  = scale8(c.blue,  145);
-    //c.green = scale8(c.green, 200);
-    //c |= CRGB( 2, 5, 7);
+    //deepen the blues and greens
+    c.blue  = scale8(c.blue,  145);
+    c.green = scale8(c.green, 200);
+    c |= CRGB( 2, 5, 7);

    SEGMENT.setPixelColor(i, c);
  }
@@ -4373,8 +4373,8 @@ void mode_noisepal(void) {                                    // Slow noise pale
    SEGENV.step = strip.now;

    unsigned baseI = hw_random8();
-    uint32_t minBri = gamma8inv(128); // use gamma inversion on min brightness value to restore pre 16.0 looks (more brilliant palettes)
-    palettes[1] = CRGBPalette16(CHSV(baseI+hw_random8(64), 255, hw_random8(minBri,255)), CHSV(baseI+128, 255, hw_random8(minBri,255)), CHSV(baseI+hw_random8(92), 192, hw_random8(minBri,255)), CHSV(baseI+hw_random8(92), 255, hw_random8(minBri,255)));
+    //palettes[1] = CRGBPalette16(CHSV(baseI+hw_random8(64), 255, hw_random8(128,255)), CHSV(baseI+128, 255, hw_random8(128,255)), CHSV(baseI+hw_random8(92), 192, hw_random8(128,255)), CHSV(baseI+hw_random8(92), 255, hw_random8(128,255)));
+    palettes[1] = CRGBPalette16(CHSV(baseI+hw_random8(64), 255, hw_random8(128,255)), CHSV(baseI+128, 255, hw_random8(128,255)), CHSV(baseI+hw_random8(92), 192, hw_random8(128,255)), CHSV(baseI+hw_random8(92), 255, hw_random8(128,255)));
  }

  //EVERY_N_MILLIS(10) { //(don't have to time this, effect function is only called every 24ms)
@@ -4759,10 +4759,10 @@ void mode_tv_simulator(void) {
        tvSimulator->actualColorB = temp[n    ];
      }
    }
-    // expand to 16 bit
-    nr = (uint8_t)(tvSimulator->actualColorR) * 257; // New R/G/B
-    ng = (uint8_t)(tvSimulator->actualColorG) * 257;
-    nb = (uint8_t)(tvSimulator->actualColorB) * 257;
+    // Apply gamma correction, further expand to 16/16/16
+    nr = (uint8_t)gamma8(tvSimulator->actualColorR) * 257; // New R/G/B
+    ng = (uint8_t)gamma8(tvSimulator->actualColorG) * 257;
+    nb = (uint8_t)gamma8(tvSimulator->actualColorB) * 257;

  if (SEGENV.aux0 == 0) {  // initialize next iteration
    SEGENV.aux0 = 1;
@@ -5720,7 +5720,7 @@ void mode_2Dmatrix(void) {                  // Matrix2D. By Jeremy Williams. Ada
    SEGENV.step = 0;
  }

-  uint8_t fade = map(SEGMENT.custom1, 0, 255, 30, 250);    // equals trail size
+  uint8_t fade = map(SEGMENT.custom1, 0, 255, 50, 250);    // equals trail size
  uint8_t speed = (256-SEGMENT.speed) >> map(min(rows, 150), 0, 150, 0, 3);    // slower speeds for small displays

  uint32_t spawnColor;
@@ -5729,8 +5729,8 @@ void mode_2Dmatrix(void) {                  // Matrix2D. By Jeremy Williams. Ada
    spawnColor = SEGCOLOR(0);
    trailColor = SEGCOLOR(1);
  } else {
-    spawnColor = RGBW32(gamma8inv(175), gamma8inv(255), gamma8inv(175), 0); // use gamma inversion to restor original pre 16.0 looks
-    trailColor = RGBW32(gamma8inv(27),  gamma8inv(130), gamma8inv(39),  0);
+    spawnColor = RGBW32(175,255,175,0);
+    trailColor = RGBW32(27,130,39,0);
  }

  bool emptyScreen = true;
@@ -7005,8 +7005,8 @@ static const char _data_FX_MODE_MIDNOISE[] PROGMEM = "Midnoise@Fade rate,Max. le
 //////////////////////
 // I am the god of hellfire. . . Volume (only) reactive fire routine. Oh, look how short this is.
 void mode_noisefire(void) {                 // Noisefire. By Andrew Tuline.
-  CRGBPalette16 myPal = CRGBPalette16(CHSV(0,255,20),    CHSV(0,255,30),    CHSV(0,255,40), CHSV(0, 255, 44),  // Fire palette definition. Lower value = darker.
-                                      CHSV(0, 255, 64), CRGB::Red,        CRGB::Red,     CRGB::Red,
+  CRGBPalette16 myPal = CRGBPalette16(CHSV(0,255,2),    CHSV(0,255,4),    CHSV(0,255,8), CHSV(0, 255, 8),  // Fire palette definition. Lower value = darker.
+                                      CHSV(0, 255, 16), CRGB::Red,        CRGB::Red,     CRGB::Red,
                                      CRGB::DarkOrange, CRGB::DarkOrange, CRGB::Orange,  CRGB::Orange,
                                      CRGB::Yellow,     CRGB::Orange,     CRGB::Yellow,  CRGB::Yellow);

@@ -7242,7 +7242,7 @@ void mode_DJLight(void) {                   // Written by ??? Adapted by Will Ta
  if (SEGENV.aux0 != secondHand) {                        // Triggered millis timing.
    SEGENV.aux0 = secondHand;

-    CRGB color = CRGB(gamma8inv(fftResult[15]/2), gamma8inv(fftResult[5]/2), gamma8inv(fftResult[0]/2)); // apply gamma inversion to restor pre 16.0 looks
+    CRGB color = CRGB(fftResult[15]/2, fftResult[5]/2, fftResult[0]/2); // 16-> 15 as 16 is out of bounds
    SEGMENT.setPixelColor(mid, color.fadeToBlackBy(map(fftResult[4], 0, 255, 255, 4)));     // TODO - Update

    // if SEGLEN equals 1 these loops won't execute
@@ -7322,7 +7322,7 @@ void mode_freqmatrix(void) {                // Freqmatrix. By Andreas Pleschung.
      uint8_t i =  lowerLimit!=upperLimit ? map(FFT_MajorPeak, lowerLimit, upperLimit, 0, 255) : FFT_MajorPeak;  // may under/overflow - so we enforce uint8_t
      unsigned b = 255 * intensity;
      if (b > 255) b = 255;
-      color = CHSV(i, 240, gamma8inv(b)); // use gamma inversion on brightness to restore pre 16.0 looks
+      color = CHSV(i, 240, (uint8_t)b); // implicit conversion to RGB supplied by FastLED
    }

    // shift the pixels one pixel up
@@ -7413,7 +7413,7 @@ void mode_freqwave(void) {                  // Freqwave. By Andreas Pleschung.
      int lowerLimit = 80 + 3 * SEGMENT.custom1;
      uint8_t i =  lowerLimit!=upperLimit ? map(FFT_MajorPeak, lowerLimit, upperLimit, 0, 255) : FFT_MajorPeak; // may under/overflow - so we enforce uint8_t
      unsigned b = min(255.0f, 255.0f * intensity);
-      color = CHSV(i, 240, gamma8inv(b)); // use gamma inversion on brightness to restore pre 16.0 looks
+      color = CHSV(i, 240, (uint8_t)b); // implicit conversion to RGB supplied by FastLED
    }

    SEGMENT.setPixelColor(SEGLEN/2, color);
@@ -7520,7 +7520,7 @@ void mode_waterfall(void) {                   // Waterfall. By: Andrew Tuline

    unsigned k = SEGLEN-1;
    if (samplePeak) {
-      pixels[k] = (uint32_t)CRGB(CHSV(92,92,gamma8inv(92))); // use gamma inversion on brightness to restore pre 16.0 looks
+      pixels[k] = (uint32_t)CRGB(CHSV(92,92,92));
    } else {
      pixels[k] = color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(pixCol+SEGMENT.intensity, false, PALETTE_SOLID_WRAP, 0), (uint8_t)my_magnitude);
    }
@@ -7631,7 +7631,7 @@ void mode_2DFunkyPlank(void) {              // Written by ??? Adapted by Will Ta
      int v = map(fftResult[band % 16], 0, 255, 10, 255);
      for (int w = 0; w < barWidth; w++) {
         int xpos = (barWidth * b) + w;
-         SEGMENT.setPixelColorXY(xpos, 0, CHSV(hue, 255, gamma8inv(v))); // use gamma inversion on brightness to restore original pre 16.0 looks
+         SEGMENT.setPixelColorXY(xpos, 0, CHSV(hue, 255, v));
      }
    }

@@ -7980,7 +7980,7 @@ void mode_2Doctopus() {
      byte radius = rMap[XY(x,y)].radius;
      //CRGB c = CHSV(SEGENV.step / 2 - radius, 255, sin8_t(sin8_t((angle * 4 - radius) / 4 + SEGENV.step) + radius - SEGENV.step * 2 + angle * (SEGMENT.custom3/3+1)));
      unsigned intensity = sin8_t(sin8_t((angle * 4 - radius) / 4 + SEGENV.step/2) + radius - SEGENV.step + angle * (SEGMENT.custom3/4+1));
-      //intensity = map((intensity*intensity) & 0xFFFF, 0, 65535, 0, 255); // add a bit of non-linearity for cleaner display -> no longer needed with proper gamma correction
+      intensity = map((intensity*intensity) & 0xFFFF, 0, 65535, 0, 255); // add a bit of non-linearity for cleaner display
      SEGMENT.setPixelColorXY(x, y, ColorFromPalette(SEGPALETTE, SEGENV.step / 2 - radius, intensity));
    }
  }
@@ -618,7 +618,6 @@ class Segment {
      DEBUGFX_PRINTLN();
      #endif
      clearName();
-      stopTransition();   // deallocate "_t" (transition) and with it "_segOld" note: _segOld has _t=null, see copy constructor
      #ifdef WLED_ENABLE_GIF
      endImagePlayback(this);
      #endif
@@ -810,11 +809,6 @@ class Segment {
  friend class ParticleSystem1D;
 };

-// max wait times when waiting until !strip.isUpdating() - use with waitForLEDs(...)
-constexpr unsigned STRIP_WAIT_VERYSHORT = 25; // 25 ms - when risk of flickering is low but delays should be avoided
-constexpr unsigned STRIP_WAIT_SHORT = 50;     // 50 ms - for cases where fluent animations are most important, and risk of flickering is low
-constexpr unsigned STRIP_WAIT_MEDIUM = 150;   // 150 ms - good balance to avoid flickering on -C3 (good up to 4000 ws2812b LEDs per pin)
-
 // main "strip" class (108 bytes)
 class WS2812FX {
  typedef void (*mode_ptr)(); // pointer to mode function
@@ -885,7 +879,6 @@ class WS2812FX {
      printSize(),                                // prints memory usage for strip components
 #endif
      finalizeInit(),                             // initialises strip components
-      updatePixelBuffer(),                        // (re)allocate memory for _pixels[]
      service(),                                  // executes effect functions when due and calls strip.show()
      setCCT(uint16_t k),                         // sets global CCT (either in relative 0-255 value or in K)
      setBrightness(uint8_t b, bool direct = false),    // sets strip brightness
@@ -915,11 +908,6 @@ class WS2812FX {
                                                              { if (_segments.size() < getMaxSegments()) _segments.emplace_back(sStart,sStop,sStartY,sStopY); }
    inline void suspend()                                     { _suspend = true; }    // will suspend (and canacel) strip.service() execution
    inline void resume()                                      { _suspend = false; }   // will resume strip.service() execution
-    inline bool isSuspended() const                           { return _suspend; }    // true if strip.service() execution is suspended
-    // be nice, but not too nice - wait until LEDs are idle, or maxWaitMS have passed
-    // on 8266 this call will _not_ wait outside of the main loop context
-    // returns isUpdating() status after waiting
-    bool waitForLEDs(unsigned maxWaitMS, bool always = false) const;

    void restartRuntime();
    void setTransitionMode(bool t);
@@ -933,6 +921,7 @@ class WS2812FX {
    inline bool isServicing() const          { return _isServicing; }           // returns true if strip.service() is executing
    inline bool hasWhiteChannel() const      { return _hasWhiteChannel; }       // returns true if strip contains separate white chanel
    inline bool isOffRefreshRequired() const { return _isOffRefreshRequired; }  // returns true if strip requires regular updates (i.e. TM1814 chipset)
+    inline bool isSuspended() const          { return _suspend; }               // returns true if strip.service() execution is suspended
    inline bool needsUpdate() const          { return _triggered; }             // returns true if strip received a trigger() request

    // uint8_t paletteBlend;  // obsolete - use global paletteBlend instead of strip.paletteBlend
@@ -98,7 +98,7 @@ Segment& Segment::operator= (const Segment &orig) {
  if (this != &orig) {
    // clean destination
    if (name) { p_free(name); name = nullptr; }
-    stopTransition(); // delete _t
+    if (_t) stopTransition(); // also erases _t
    deallocateData();
    p_free(pixels);
    pixels = nullptr;
@@ -131,7 +131,7 @@ Segment& Segment::operator= (Segment &&orig) noexcept {
  //DEBUG_PRINTF_P(PSTR("-- Moving segment: %p -> %p\n"), &orig, this);
  if (this != &orig) {
    if (name) { p_free(name); name = nullptr; } // free old name
-    stopTransition(); // delete _t
+    if (_t) stopTransition(); // also erases _t
    deallocateData(); // free old runtime data
    p_free(pixels);   // free old pixel buffer
    // move source data
@@ -290,8 +290,6 @@ void Segment::loadPalette(CRGBPalette16 &targetPalette, uint8_t pal) {
 }

 // starting a transition has to occur before change so we get current values 1st
-// note: _t is the temporary segment that holds the values transitioned from (palette, colors, brightness,...) and the current segment holds the "to" values
-//       if this is a non FADE transition or an FX change, the _oldSegment is created which is a full copy of the segment before the change
 void Segment::startTransition(uint16_t dur, bool segmentCopy) {
  if (dur == 0 || !isActive()) {
    if (isInTransition()) _t->_dur = 0;
@@ -301,42 +299,15 @@ void Segment::startTransition(uint16_t dur, bool segmentCopy) {
    if (segmentCopy && !_t->_oldSegment) {
      // already in transition but segment copy requested and not yet created
      _t->_oldSegment = new(std::nothrow) Segment(*this); // store/copy current segment settings
-      _t->_start = millis(); // restart transition timer
+      _t->_start = millis();                              // restart countdown
      _t->_dur   = dur;
-      _t->_prevPaletteBlends = 0; // reset palette blends
+      _t->_prevPaletteBlends = 0;
      if (_t->_oldSegment) {
-        _t->_oldSegment->palette = _t->_palette; // restore original palette, colors, brightness and CCT (from start of transition)
+        _t->_oldSegment->palette = _t->_palette;          // restore original palette and colors (from start of transition)
        for (unsigned i = 0; i < NUM_COLORS; i++) _t->_oldSegment->colors[i] = _t->_colors[i];
-        _t->_oldSegment->opacity = _t->_bri;
-        _t->_oldSegment->cct     = _t->_cct;
-        // if already partway through a FADE transition, set old segment's colors to current blend to avoid jumping back to original colors
-        if (_t->_progress > 0) {
-          // already in a transition, see comment below
-          for (unsigned i = 0; i < NUM_COLORS; i++) _t->_oldSegment->colors[i] = color_blend16(_t->_colors[i], colors[i], _t->_progress);
-          _t->_oldSegment->opacity = currentBri(); // update "original" brightness note: _t->_progress is updated in updateTransitionProgress() so still valid here
-          _t->_oldSegment->cct     = currentCCT(); // update "original" CCT (reduces jump)
-        }
        DEBUGFX_PRINTF_P(PSTR("-- Updated transition with segment copy: S=%p T(%p) O[%p] OP[%p]\n"), this, _t, _t->_oldSegment, _t->_oldSegment->pixels);
        if (!_t->_oldSegment->isActive()) stopTransition();
      }
-    } else if (_t->_progress > 0) {
-      // already in a transition: capture the current visual blend as the new "from" state so the incoming change does not cause a visible jump.
-      // _palT already holds the intermediate blended palette and will continue blending toward the new target (see beginDraw()), so no palette action needed.
-      // initial version by @blazoncek (https://github.com/blazoncek/WLED/commit/40d9812)
-      for (unsigned i = 0; i < NUM_COLORS; i++) _t->_colors[i] = color_blend16(_t->_colors[i], colors[i], _t->_progress);
-      _t->_bri = currentBri(); // update "original" brightness note: _t->_progress is updated in updateTransitionProgress() so still valid here
-      _t->_cct = currentCCT(); // update "original" CCT (reduces jump)
-      // restart transition timer only if a pure FADE transition, otherwise let the FX change or non-FADE transition finish
-      // this avoids a re-start of the transition if color or brightness is changed during an ongoing FX or non-FADE transition
-      if (blendingStyle == TRANSITION_FADE) {
-        if (_t->_oldSegment != nullptr) {
-          if (_t->_oldSegment->mode != mode)
-            return; // do not reset transition if this is an FX change, note: the disadvantage is that colors still jump in that case
-        }
-        _t->_start = millis();
-        _t->_dur   = dur;
-        _t->_prevPaletteBlends = 0;
-      }
    }
    return;
  }
@@ -362,7 +333,6 @@ void Segment::startTransition(uint16_t dur, bool segmentCopy) {
 }

 void Segment::stopTransition() {
-  if (_t == nullptr) return; // no ongoing transition
  DEBUG_PRINTF_P(PSTR("-- Stopping transition: S=%p T(%p) O[%p]\n"), this, _t, _t->_oldSegment);
  delete _t;
  _t = nullptr;
@@ -395,7 +365,7 @@ uint8_t Segment::currentBri() const {
  if (prog < 0xFFFFU) {
    // this will blend opacity in new mode if style is FADE (single effect call)
    if (blendingStyle == TRANSITION_FADE) curBri = (prog * curBri + _t->_bri * (0xFFFFU - prog)) / 0xFFFFU;
-    else                                  curBri = Segment::isPreviousMode() ? _t->_bri : curBri;
+    else                                   curBri = Segment::isPreviousMode() ? _t->_bri : curBri;
  }
  return curBri;
 }
@@ -482,7 +452,7 @@ void Segment::setGeometry(uint16_t i1, uint16_t i2, uint8_t grp, uint8_t spc, ui

  DEBUGFX_PRINTF_P(PSTR("Segment geometry: %d,%d -> %d,%d [%d,%d]\n"), (int)i1, (int)i2, (int)i1Y, (int)i2Y, (int)grp, (int)spc);
  markForReset();
-  stopTransition(); // we can't use transition if segment dimensions changed
+  if (_t) stopTransition(); // we can't use transition if segment dimensions changed
  stateChanged = true;      // send UDP/WS broadcast

  // apply change immediately
@@ -1147,7 +1117,7 @@ void Segment::blur(uint8_t blur_amount, bool smear) const {
 * Rotates the color in HSV space, where pos is H. (0=0deg, 256=360deg)
 */
 uint32_t Segment::color_wheel(uint8_t pos) const {
-  if (palette) return color_from_palette(pos, false, true, 0); // color_wheel is a continuous (moving) wheel, so wrap end->start (restores pre-0.16 behaviour)
+  if (palette) return color_from_palette(pos, false, false, 0); // only wrap if "always wrap" is set
  uint8_t w = W(getCurrentColor(0));
  CRGBW rgb;
  rgb = CHSV32(static_cast<uint16_t>(pos << 8), 255, 255);
@@ -1302,17 +1272,11 @@ void WS2812FX::finalizeInit() {
  deserializeMap();     // (re)load default ledmap (will also setUpMatrix() if ledmap does not exist)

  // allocate frame buffer after matrix has been set up (gaps!)
-  updatePixelBuffer();
-  DEBUG_PRINTF_P(PSTR("Heap after strip init: %uB\n"), getFreeHeapSize());
-}
-
-// update global _pixels[] buffer to match getLengthTotal() note: if allocation fails, WLED will not render anything
-void WS2812FX::updatePixelBuffer() {
-  uint32_t requiredMem = getLengthTotal() * sizeof(uint32_t);
  p_free(_pixels); // using realloc on large buffers can cause additional fragmentation instead of reducing it
  // use PSRAM if available: there is no measurable perfomance impact between PSRAM and DRAM on S2/S3 with QSPI PSRAM for this buffer
-  _pixels = static_cast<uint32_t*>(allocate_buffer(requiredMem, BFRALLOC_ENFORCE_PSRAM | BFRALLOC_NOBYTEACCESS | BFRALLOC_CLEAR));
-  DEBUG_PRINTF_P(PSTR("strip buffer size: %uB\n"), requiredMem);
+  _pixels = static_cast<uint32_t*>(allocate_buffer(getLengthTotal() * sizeof(uint32_t), BFRALLOC_ENFORCE_PSRAM | BFRALLOC_NOBYTEACCESS | BFRALLOC_CLEAR));
+  DEBUG_PRINTF_P(PSTR("strip buffer size: %uB\n"), getLengthTotal() * sizeof(uint32_t));
+  DEBUG_PRINTF_P(PSTR("Heap after strip init: %uB\n"), getFreeHeapSize());
 }

 void WS2812FX::service() {
@@ -1766,9 +1730,6 @@ void WS2812FX::show() {
  int oldCCT = Bus::getCCT(); // store original CCT value (since it is global)
  // when cctFromRgb is true we implicitly calculate WW and CW from RGB values (cct==-1)
  if (cctFromRgb) BusManager::setSegmentCCT(-1);
-  // use color gamma correction if enabled, not in realtime mode with gamma disabled or currently overriding RT mode
-  bool useGammaCorrection = gammaCorrectCol && !(realtimeMode && arlsDisableGammaCorrection && !realtimeOverride);
-
  for (size_t i = 0; i < totalLen; i++) {
    // when correctWB is true setSegmentCCT() will convert CCT into K with which we can then
    // correct/adjust RGB value according to desired CCT value, it will still affect actual WW/CW ratio
@@ -1777,8 +1738,8 @@ void WS2812FX::show() {
    }

    uint32_t c = _pixels[i]; // need a copy, do not modify _pixels directly (no byte access allowed on ESP32)
-    if (c > 0 && useGammaCorrection)
-      c = gamma32(c); // apply gamma correction if enabled note: applying gamma after brightness has too much color loss
+    if (c > 0 && !(realtimeMode && arlsDisableGammaCorrection))
+        c = gamma32(c); // apply gamma correction if enabled note: applying gamma after brightness has too much color loss
    BusManager::setPixelColor(getMappedPixelIndex(i), c);
  }
  Bus::setCCT(oldCCT);  // restore old CCT for ABL adjustments
@@ -1837,33 +1798,6 @@ void WS2812FX::waitForIt() {
  #endif
 };

-/**
- * Be nice, but not too nice - wait until LEDs are idle, or maxWaitMS milliseconds have passed. 
- * always=true enforces waiting even when using the RMTHI driver.
- * On 8266 this call will _not_ wait outside the main loop context.
- *  Function returns isUpdating() status after waiting.
- **/
-bool WS2812FX::waitForLEDs(unsigned maxWaitMS, bool always) const {
-  #ifdef ARDUINO_ARCH_ESP32 
-    #if !defined(WLED_USE_SHARED_RMT) && !defined(__riscv)
-    // shortcut: don't wait if we have the RMTHI driver, unless requested with "always = true"
-    if (!always) return isUpdating();
-    #endif
-
-    unsigned long waitStart = millis();
-    while (isUpdating() && (millis() - waitStart < maxWaitMS)) delay(1);
-  #else
-    if (can_yield()) {
-      // If we are in a yieldable context (main loop), wait until the LEDs output finishes
-      yield();
-      unsigned long waitStart = millis();
-      while (isUpdating() && (millis() - waitStart < maxWaitMS)) delay(1);
-      yield();
-    }
-  #endif
-  return isUpdating();
-}
-
 void WS2812FX::setTargetFps(unsigned fps) {
  if (fps <= 250) _targetFps = fps;
  if (_targetFps > 0) _frametime = 1000 / _targetFps;
@@ -2146,13 +2080,10 @@ bool WS2812FX::deserializeMap(unsigned n) {
  customMappingSize = 0; // prevent use of mapping if anything goes wrong
  currentLedmap = 0;
  if (n == 0 || isFile) interfaceUpdateCallMode = CALL_MODE_WS_SEND; // schedule WS update (to inform UI)
-  uint32_t lengthTotalBefore = strip.getLengthTotal();

  if (!isFile && n==0 && isMatrix) {
    // 2D panel support creates its own ledmap (on the fly) if a ledmap.json does not exist
    setUpMatrix();
-    if (strip.getLengthTotal() != lengthTotalBefore)
-      strip.updatePixelBuffer(); // allocate _pixels[] to match new length
    return false;
  }

@@ -2227,8 +2158,6 @@ bool WS2812FX::deserializeMap(unsigned n) {
  }

  releaseJSONBufferLock();
-  if (strip.getLengthTotal() != lengthTotalBefore)
-    strip.updatePixelBuffer(); // allocate _pixels[] to match new length
  return (customMappingSize > 0);
 }

@@ -351,25 +351,26 @@ void BusDigital::setColorOrder(uint8_t colorOrder) {
 // credit @willmmiles & @netmindz https://github.com/wled/WLED/pull/4056
 std::vector<LEDType> BusDigital::getLEDTypes() {
  return {
-    {TYPE_WS2812_RGB,    "D",  PSTR("WS281x RGB")},
-    {TYPE_WS2811_400KHZ, "D",  PSTR("400kHz RGB")},
-    {TYPE_TM1829,        "D",  PSTR("TM1829 RGB")},
-    {TYPE_UCS8903,       "D",  PSTR("UCS8903 RGB")},
-    {TYPE_APA106,        "D",  PSTR("APA106/PL9823 RGB")},
-    {TYPE_TM1914,        "D",  PSTR("TM1914 RGB")},
+    {TYPE_WS2812_RGB,    "D",  PSTR("WS281x")},
    {TYPE_SK6812_RGBW,   "D",  PSTR("SK6812/WS2814 RGBW")},
+    {TYPE_TM1814,        "D",  PSTR("TM1814")},
+    {TYPE_WS2811_400KHZ, "D",  PSTR("400kHz")},
+    {TYPE_TM1829,        "D",  PSTR("TM1829")},
+    {TYPE_UCS8903,       "D",  PSTR("UCS8903")},
+    {TYPE_APA106,        "D",  PSTR("APA106/PL9823")},
+    {TYPE_TM1914,        "D",  PSTR("TM1914")},
+    {TYPE_FW1906,        "D",  PSTR("FW1906 GRBCW")},
    {TYPE_UCS8904,       "D",  PSTR("UCS8904 RGBW")},
-    {TYPE_TM1814,        "D",  PSTR("TM1814 RGBW")},
-    {TYPE_FW1906,        "D",  PSTR("FW1906/WS2811 RGBCCT")},
-    {TYPE_WS2805,        "D",  PSTR("WS2805 RGBCCT")},
-    {TYPE_SM16825,       "D",  PSTR("SM16825 RGBCCT")},
+    {TYPE_WS2805,        "D",  PSTR("WS2805 RGBCW")},
+    {TYPE_SM16825,       "D",  PSTR("SM16825 RGBCW")},
    {TYPE_WS2812_1CH_X3, "D",  PSTR("WS2811 White")},
+    //{TYPE_WS2812_2CH_X3, "D",  PSTR("WS281x CCT")}, // not implemented
    {TYPE_WS2812_WWA,    "D",  PSTR("WS281x WWA")}, // amber ignored
-    {TYPE_WS2801,        "2P", PSTR("WS2801 RGB")},
-    {TYPE_APA102,        "2P", PSTR("APA102 RGB")},
-    {TYPE_LPD8806,       "2P", PSTR("LPD8806 RGB")},
-    {TYPE_LPD6803,       "2P", PSTR("LPD6803 RGB")},
-    {TYPE_P9813,         "2P", PSTR("P9813 RGB")},
+    {TYPE_WS2801,        "2P", PSTR("WS2801")},
+    {TYPE_APA102,        "2P", PSTR("APA102")},
+    {TYPE_LPD8806,       "2P", PSTR("LPD8806")},
+    {TYPE_LPD6803,       "2P", PSTR("LPD6803")},
+    {TYPE_P9813,         "2P", PSTR("PP9813")},
  };
 }

@@ -610,7 +611,7 @@ std::vector<LEDType> BusPwm::getLEDTypes() {
    {TYPE_ANALOG_2CH, "AA",     PSTR("PWM CCT")},
    {TYPE_ANALOG_3CH, "AAA",    PSTR("PWM RGB")},
    {TYPE_ANALOG_4CH, "AAAA",   PSTR("PWM RGBW")},
-    {TYPE_ANALOG_5CH, "AAAAA",  PSTR("PWM RGBCCT")},
+    {TYPE_ANALOG_5CH, "AAAAA",  PSTR("PWM RGB+CCT")},
    //{TYPE_ANALOG_6CH, "AAAAAA", PSTR("PWM RGB+DCCT")}, // unimplementable ATM
  };
 }
@@ -812,7 +813,6 @@ BusHub75Matrix::BusHub75Matrix(const BusConfig &bc) : Bus(bc.type, bc.start, bc.

  // mxconfig.driver = HUB75_I2S_CFG::ICN2038S;  // experimental - use specific shift register driver
  // mxconfig.driver = HUB75_I2S_CFG::FM6124;    // try this driver in case you panel stays dark, or when colors look too pastel
-  // Other possible shiftreg drivers: HUB75_I2S_CFG::FM6126A, HUB75_I2S_CFG::ICN2038S, HUB75_I2S_CFG::MBI5124, HUB75_I2S_CFG::DP3246

  // mxconfig.latch_blanking = 3;
  // mxconfig.i2sspeed = HUB75_I2S_CFG::HZ_10M;  // experimental - 5MHZ should be enugh, but colours looks slightly better at 10MHz
@@ -824,13 +824,8 @@ BusHub75Matrix::BusHub75Matrix(const BusConfig &bc) : Bus(bc.type, bc.start, bc.
  mxconfig.chain_length = max((uint8_t) 1, min(chainLength, (uint8_t) 4));

  if (mxconfig.mx_height >= 64 && (mxconfig.chain_length > 1)) {
-  #if defined(BOARD_HAS_PSRAM)                    // limitation to one panel only applies to boards without PSRAM
-    if (!psramFound() || ESP.getPsramSize() == 0) // PSRAM sanity check
-  #endif
-    {
-      DEBUGBUS_PRINTLN(F("WARNING, only single panel can be used of 64 pixel boards due to memory"));
-      mxconfig.chain_length = 1;
-    }
+    DEBUGBUS_PRINTLN(F("WARNING, only single panel can be used of 64 pixel boards due to memory"));
+    mxconfig.chain_length = 1;
  }

  if (bc.type == TYPE_HUB75MATRIX_HS) {
@@ -840,7 +835,6 @@ BusHub75Matrix::BusHub75Matrix(const BusConfig &bc) : Bus(bc.type, bc.start, bc.
      _isVirtual = true;
      mxconfig.mx_width = min((uint8_t) 64, panelWidth) * 2;
      mxconfig.mx_height = min((uint8_t) 64, panelHeight) / 2;
-      mxconfig.driver = HUB75_I2S_CFG::FM6124;  // use FM6124 for "outdoor" 4-scan panels - workaround until we can make the driver user-configurable
  } else {
    DEBUGBUS_PRINTLN("Unknown type");
    return;
@@ -880,12 +874,6 @@ BusHub75Matrix::BusHub75Matrix(const BusConfig &bc) : Bus(bc.type, bc.start, bc.
  // HUB75_I2S_CFG::i2s_pins _pins={R1_PIN, G1_PIN, B1_PIN, R2_PIN, G2_PIN, B2_PIN, A_PIN, B_PIN, C_PIN, D_PIN, E_PIN, LAT_PIN, OE_PIN, CLK_PIN};
  mxconfig.gpio = { 1, 5, 6, 7, 13, 9, 16, 48, 47, 21, 38, 8, 4, 18 };

-#elif defined(WAVESHARE_S3_PINOUT)
-  DEBUGBUS_PRINTLN("MatrixPanel_I2S_DMA - Waveshare S3 with PSRAM, Waveshare pinout");
-
-  // HUB75_I2S_CFG::i2s_pins _pins={R1_PIN, G1_PIN, B1_PIN, R2_PIN, G2_PIN, B2_PIN, A_PIN, B_PIN, C_PIN, D_PIN, E_PIN, LAT_PIN, OE_PIN, CLK_PIN};
-  mxconfig.gpio = {4, 5, 6, 7, 15, 16, 18, 8, 3, 42, 9, 40, 2, 41};
-  
 #else
  DEBUGBUS_PRINTLN("MatrixPanel_I2S_DMA - S3 with PSRAM");
  // HUB75_I2S_CFG::i2s_pins _pins={R1_PIN, G1_PIN, B1_PIN, R2_PIN, G2_PIN, B2_PIN, A_PIN, B_PIN, C_PIN, D_PIN, E_PIN, LAT_PIN, OE_PIN, CLK_PIN};
@@ -1002,8 +990,10 @@ BusHub75Matrix::BusHub75Matrix(const BusConfig &bc) : Bus(bc.type, bc.start, bc.
    }
    setBitArray(_ledsDirty, _len, false);             // reset dirty bits

-    // create LEDs buffer (initialized to BLACK), prefer DRAM if enough heap is available (faster in case global _pixels buffer is in PSRAM as not both will fit the cache)
-    _ledBuffer = static_cast<CRGB*>(allocate_buffer(_len * sizeof(CRGB), BFRALLOC_PREFER_DRAM | BFRALLOC_CLEAR));
+    if (mxconfig.double_buff == false) {
+      // create LEDs buffer (initialized to BLACK), prefer DRAM if enough heap is available (faster in case global _pixels buffer is in PSRAM as not both will fit the cache)
+      _ledBuffer = static_cast<CRGB*>(allocate_buffer(_len * sizeof(CRGB), BFRALLOC_PREFER_DRAM | BFRALLOC_CLEAR));
+    }
  }

  PANEL_CHAIN_TYPE chainType = CHAIN_NONE; // default for quarter-scan panels that do not use chaining
@@ -184,9 +184,10 @@ class Bus {
              type == TYPE_NET_DDP_RGBW || type == TYPE_NET_ARTNET_RGBW;                   // network types with white channel
    }
    static constexpr bool hasCCT(uint8_t type) {
-      return  type == TYPE_WS2812_WWA    || type == TYPE_SM16825 ||
+      return  type == TYPE_WS2812_2CH_X3 || type == TYPE_WS2812_WWA ||
              type == TYPE_ANALOG_2CH    || type == TYPE_ANALOG_5CH ||
-              type == TYPE_FW1906        || type == TYPE_WS2805;
+              type == TYPE_FW1906        || type == TYPE_WS2805     ||
+              type == TYPE_SM16825;
    }
    static constexpr bool  isTypeValid(uint8_t type)  { return (type > 15 && type < 128); }
    static constexpr bool  isDigital(uint8_t type)    { return (type >= TYPE_DIGITAL_MIN && type <= TYPE_DIGITAL_MAX) || is2Pin(type); }
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #ifndef BusWrapper_h
 #define BusWrapper_h

@@ -50,7 +50,7 @@
 #define I_8266_U1_UCS_4 26
 #define I_8266_DM_UCS_4 27
 #define I_8266_BB_UCS_4 28
-//FW1906 GRBCCT
+//FW1906 GRBCW
 #define I_8266_U0_FW6_5 29
 #define I_8266_U1_FW6_5 30
 #define I_8266_DM_FW6_5 31
@@ -60,7 +60,7 @@
 #define I_8266_U1_APA106_3 34
 #define I_8266_DM_APA106_3 35
 #define I_8266_BB_APA106_3 36
-//WS2805 (RGBCCT)
+//WS2805 (RGBCW)
 #define I_8266_U0_2805_5 37
 #define I_8266_U1_2805_5 38
 #define I_8266_DM_2805_5 39
@@ -70,7 +70,7 @@
 #define I_8266_U1_TM1914_3 42
 #define I_8266_DM_TM1914_3 43
 #define I_8266_BB_TM1914_3 44
-//SM16825 (RGBCCT)
+//SM16825 (RGBCW)
 #define I_8266_U0_SM16825_5 45
 #define I_8266_U1_SM16825_5 46
 #define I_8266_DM_SM16825_5 47
@@ -98,19 +98,19 @@
 //UCS8904 (RGBW)
 #define I_32_RN_UCS_4 25
 #define I_32_I2_UCS_4 26
-//FW1906 GRBCCT 6 color channels
+//FW1906 GRBCW
 #define I_32_RN_FW6_5 29
 #define I_32_I2_FW6_5 30
 //APA106
 #define I_32_RN_APA106_3 33
 #define I_32_I2_APA106_3 34
-//WS2805 (RGBCCT)
+//WS2805 (RGBCW)
 #define I_32_RN_2805_5 37
 #define I_32_I2_2805_5 38
 //TM1914 (RGB)
 #define I_32_RN_TM1914_3 41
 #define I_32_I2_TM1914_3 42
-//SM16825 (RGBCCT)
+//SM16825 (RGBCW)
 #define I_32_RN_SM16825_5 45
 #define I_32_I2_SM16825_5 46

@@ -180,12 +180,12 @@
 #define B_8266_U1_APA106_3 NeoPixelBus<NeoRbgFeature, NeoEsp8266Uart1Apa106Method> //3 chan, esp8266, gpio2
 #define B_8266_DM_APA106_3 NeoPixelBus<NeoGrbFeature, NeoEsp8266DmaApa106Method>  //3 chan, esp8266, gpio3
 #define B_8266_BB_APA106_3 NeoPixelBus<NeoGrbFeature, NeoEsp8266BitBangApa106Method> //3 chan, esp8266, bb (any pin but 16)
-//FW1906 GRBCCT
+//FW1906 GRBCW
 #define B_8266_U0_FW6_5 NeoPixelBus<NeoGrbcwxFeature, NeoEsp8266Uart0Ws2813Method>   //esp8266, gpio1
 #define B_8266_U1_FW6_5 NeoPixelBus<NeoGrbcwxFeature, NeoEsp8266Uart1Ws2813Method>   //esp8266, gpio2
 #define B_8266_DM_FW6_5 NeoPixelBus<NeoGrbcwxFeature, NeoEsp8266Dma800KbpsMethod>   //esp8266, gpio3
 #define B_8266_BB_FW6_5 NeoPixelBus<NeoGrbcwxFeature, NeoEsp8266BitBang800KbpsMethod>   //esp8266, bb
-//WS2805 GRBCCT
+//WS2805 GRBCW
 #define B_8266_U0_2805_5 NeoPixelBus<NeoGrbwwFeature, NeoEsp8266Uart0Ws2805Method> //esp8266, gpio1
 #define B_8266_U1_2805_5 NeoPixelBus<NeoGrbwwFeature, NeoEsp8266Uart1Ws2805Method> //esp8266, gpio2
 #define B_8266_DM_2805_5 NeoPixelBus<NeoGrbwwFeature, NeoEsp8266DmaWs2805Method> //esp8266, gpio3
@@ -195,7 +195,7 @@
 #define B_8266_U1_TM1914_3 NeoPixelBus<NeoRgbTm1914Feature, NeoEsp8266Uart1Tm1914Method>
 #define B_8266_DM_TM1914_3 NeoPixelBus<NeoRgbTm1914Feature, NeoEsp8266DmaTm1914Method>
 #define B_8266_BB_TM1914_3 NeoPixelBus<NeoRgbTm1914Feature, NeoEsp8266BitBangTm1914Method>
-//Sm16825 (RGBCCT)
+//Sm16825 (RGBWC)
 #define B_8266_U0_SM16825_5 NeoPixelBus<NeoRgbwcSm16825eFeature, NeoEsp8266Uart0Ws2813Method>
 #define B_8266_U1_SM16825_5 NeoPixelBus<NeoRgbwcSm16825eFeature, NeoEsp8266Uart1Ws2813Method>
 #define B_8266_DM_SM16825_5 NeoPixelBus<NeoRgbwcSm16825eFeature, NeoEsp8266Dma800KbpsMethod>
@@ -285,11 +285,11 @@
 #define B_32_RN_APA106_3 NeoPixelBus<NeoGrbFeature, NeoEsp32RmtMethod(Apa106)>
 #define B_32_I2_APA106_3 NeoPixelBus<NeoGrbFeature, X1Apa106Method>
 #define B_32_IP_APA106_3 NeoPixelBus<NeoGrbFeature, X8Apa106Method> // parallel I2S
-//FW1906 GRBCCT 6 color channels
+//FW1906 GRBCW
 #define B_32_RN_FW6_5 NeoPixelBus<NeoGrbcwxFeature, NeoEsp32RmtMethod(Ws2812x)>
 #define B_32_I2_FW6_5 NeoPixelBus<NeoGrbcwxFeature, X1800KbpsMethod>
 #define B_32_IP_FW6_5 NeoPixelBus<NeoGrbcwxFeature, X8800KbpsMethod> // parallel I2S
-//WS2805 RGBCCT
+//WS2805 RGBWC
 #define B_32_RN_2805_5 NeoPixelBus<NeoGrbwwFeature, NeoEsp32RmtMethod(Ws2805)>
 #define B_32_I2_2805_5 NeoPixelBus<NeoGrbwwFeature, X1Ws2805Method>
 #define B_32_IP_2805_5 NeoPixelBus<NeoGrbwwFeature, X8Ws2805Method> // parallel I2S
@@ -297,7 +297,7 @@
 #define B_32_RN_TM1914_3 NeoPixelBus<NeoGrbTm1914Feature, NeoEsp32RmtMethod(Tm1914)>
 #define B_32_I2_TM1914_3 NeoPixelBus<NeoGrbTm1914Feature, X1Tm1914Method>
 #define B_32_IP_TM1914_3 NeoPixelBus<NeoGrbTm1914Feature, X8Tm1914Method> // parallel I2S
-//Sm16825 (RGBCCT)
+//Sm16825 (RGBWC)
 #define B_32_RN_SM16825_5 NeoPixelBus<NeoRgbcwSm16825eFeature, NeoEsp32RmtMethod(Ws2812x)>
 #define B_32_I2_SM16825_5 NeoPixelBus<NeoRgbcwSm16825eFeature, X1Ws2812xMethod>
 #define B_32_IP_SM16825_5 NeoPixelBus<NeoRgbcwSm16825eFeature, X8Ws2812xMethod> // parallel I2S
@@ -358,7 +358,6 @@ class PolyBus {
    #ifdef ESP8266
    dotStar_strip->Begin();
    #else
-    if (miso == -1) miso = 127; // note: in arduino core, -1 means "default" not "none", passing 127 as the MISO pin is a workaround to prevent SPI.begin() assign the default pin, see #5670
    if (sck == -1 && mosi == -1) dotStar_strip->Begin();
    else                         dotStar_strip->Begin(sck, miso, mosi, ss);
    #endif
@@ -1316,6 +1315,7 @@ class PolyBus {
      if (offset > 3) offset = 3;
      switch (busType) {
        case TYPE_WS2812_1CH_X3:
+        case TYPE_WS2812_2CH_X3:
        case TYPE_WS2812_RGB:
        case TYPE_WS2812_WWA:
          t = I_8266_U0_NEO_3 + offset; break;
@@ -1358,6 +1358,7 @@ class PolyBus {
      // Now determine actual bus type with the chosen offset
      switch (busType) {
        case TYPE_WS2812_1CH_X3:
+        case TYPE_WS2812_2CH_X3:
        case TYPE_WS2812_RGB:
        case TYPE_WS2812_WWA:
          t = I_32_RN_NEO_3 + offset; break;
@@ -319,7 +319,7 @@ static_assert(WLED_MAX_BUSSES <= 32, "WLED_MAX_BUSSES exceeds hard limit");
 #define TYPE_DIGITAL_MIN         16            // first usable digital type
 #define TYPE_WS2812_1CH          18            //white-only chips (1 channel per IC) (unused)
 #define TYPE_WS2812_1CH_X3       19            //white-only chips (3 channels per IC)
-//#define TYPE_WS2812_2CH_X3       20            // use FW1906
+#define TYPE_WS2812_2CH_X3       20            //CCT chips (1st IC controls WW + CW of 1st zone and CW of 2nd zone, 2nd IC controls WW of 2nd zone and WW + CW of 3rd zone)
 #define TYPE_WS2812_WWA          21            //amber + warm + cold white
 #define TYPE_WS2812_RGB          22
 #define TYPE_GS8608              23            //same driver as WS2812, but will require signal 2x per second (else displays test pattern)
@@ -472,8 +472,6 @@ static_assert(WLED_MAX_BUSSES <= 32, "WLED_MAX_BUSSES exceeds hard limit");
 #define ERR_OVERTEMP    30  // An attached temperature sensor has measured above threshold temperature (not implemented)
 #define ERR_OVERCURRENT 31  // An attached current sensor has measured a current above the threshold (not implemented)
 #define ERR_UNDERVOLT   32  // An attached voltmeter has measured a voltage below the threshold (not implemented)
-#define ERR_REBOOT_NEEDED 98 // reboot needed after changing hardware setting
-#define ERR_POWEROFF_NEEDED 99 // power-cycle needed after changing hardware setting

 // JSON buffer lock owners
 #define JSON_LOCK_UNKNOWN        255
@@ -190,7 +190,7 @@
 		}
 	}
 	function pMP() { // populateMacroPresets
-		var presetOpts = '<option value="0">Default Action (0)</option>' + sortedPresetOptions;
+		var presetOpts = '<option value="0">Default Action</option>' + sortedPresetOptions;
 		var fields = ['A0','A1','MC','MN'];
 		for (var f of fields) {
 			var inp = gN(f);
@@ -219,38 +219,13 @@
 			rPS(sel, presetOpts, "data-preset");
 		}
 	}
-	function bAO() { // buildAnalogOptions: analog functions + per-segment opacity (segment 0 included; MD=0 => segment 0)
-		var o = '<optgroup label="Analog Functions"><option value="250">Global brightness (250)</option><option value="249">Effect speed (249)</option><option value="248">Effect intensity (248)</option><option value="247">Palette (247)</option><option value="200">Primary color hue (200)</option></optgroup><optgroup label="Analog Segment Opacity">';
-		for (var j=0; j<=32; j++) o += `<option value="${j}">Segment ${j} opacity</option>`;
-		o += '</optgroup>';
-		return o;
-	}
-	function isAnalogBtn(t) { return t==7 || t==8; } // BTN_TYPE_ANALOG / BTN_TYPE_ANALOG_INVERTED
-	function isSwitchBtn(t) { return t==4 || t==5 || t==9; } // BTN_TYPE_SWITCH / BTN_TYPE_PIR_SENSOR / BTN_TYPE_TOUCH_SWITCH
-	function btnTypeName(t) { // mirrors the button type dropdown on the LED settings page
-		switch (+t) {
-			case 2: return 'Pushbutton';
-			case 3: return 'Push inverted';
-			case 4: return 'Switch';
-			case 5: return 'PIR sensor';
-			case 6: return 'Touch';
-			case 7: return 'Analog';
-			case 8: return 'Analog inverted';
-			case 9: return 'Touch (switch)';
-			default: return 'Disabled';
-		}
-	}
 	function rBPO() { // refreshButtonPresetOptions
-		var presetOpts = '<option value="0">Default Action (0)</option>' + sortedPresetOptions;
-		var analogOpts = bAO();
+		var presetOpts = '<option value="0">Default Action</option>' + sortedPresetOptions;
 		var container = gId("macros");
 		if (!container) return;
-		// analog buttons only have an MD select (MP/ML are hidden 0 inputs); MD uses analog options, never presets
 		var sels = container.querySelectorAll('select[name^="MP"],select[name^="ML"],select[name^="MD"]');
 		for (var sel of sels) {
-			var bb = sel.closest ? sel.closest(".bb") : null;
-			var t = bb ? parseInt(bb.getAttribute("data-btype")||"0",10) : 0;
-			rPS(sel, isAnalogBtn(t) ? analogOpts : presetOpts, "data-preset");
+			rPS(sel, presetOpts, "data-preset");
 		}
 	}
 	function Wd()
@@ -271,73 +246,33 @@
 		if (d.Sf.LTR.value==="S") { d.Sf.LT.value = -1*parseFloat(d.Sf.LT.value); }
 		if (d.Sf.LNR.value==="W") { d.Sf.LN.value = -1*parseFloat(d.Sf.LN.value); }
 	}
-	function addRow(i,p,l,d,t) {
-		if (t===undefined) t = 0;
+	function addRow(i,p,l,d) {
 		var b = String.fromCharCode((i<10?48:55)+i);
-		var presetOpts = '<option value="0">Default Action (0)</option>' + sortedPresetOptions;
-		var typeName = btnTypeName(t);
+		var presetOpts = '<option value="0">Default Action</option>' + sortedPresetOptions;
 		var buttonBlock = document.createElement('div');
 		buttonBlock.className = 'bb';
-		buttonBlock.setAttribute('data-btype', t); // read back by rBPO() to rebuild selects correctly
-		if (isAnalogBtn(t)) {
-			// analog buttons: MD holds the function/segment; short/long press are unused (firmware defaults missing MP/ML to 0)
-			buttonBlock.innerHTML = `
-				<div class="bh">Analog ${i} - ${typeName}</div>
-				<div class="bs">
-					<div class="ba">
-						<label>Analog function</label>
-						<select name="MD${b}" class="s" required>${bAO()}</select>
-					</div>
+		buttonBlock.innerHTML = `
+			<div class="bh">Button ${i}</div>
+			<div class="bs">
+				<div class="ba">
+					<label>Push/Switch</label>
+					<select name="MP${b}" class="s" required>${presetOpts}</select>
 				</div>
-				<hr style="width:100%;margin:8px 0 0 0;">
-			`;
-			sPSV(buttonBlock.querySelector('select[name="MD'+b+'"]'), String(d), "data-preset");
-		} else if (isSwitchBtn(t)) {
-			// switches: MP fires on On->Off, ML on Off->On; double press (MD) is unused (firmware defaults missing MD to 0)
-			buttonBlock.innerHTML = `
-				<div class="bh">Switch ${i} - ${typeName}</div>
-				<div class="bs">
-					<div class="ba">
-						<label>On → Off</label>
-						<select name="MP${b}" class="s" required>${presetOpts}</select>
-					</div>
-					<div class="ba">
-						<label>Off → On</label>
-						<select name="ML${b}" class="s" required>${presetOpts}</select>
-					</div>
+				<div class="ba">
+					<label>Short (on→off)</label>
+					<select name="ML${b}" class="s" required>${presetOpts}</select>
 				</div>
-				<hr style="width:100%;margin:8px 0 0 0;">
-			`;
-			var switchSels = buttonBlock.querySelectorAll("select");
-			var switchVals = [String(p), String(l)];
-			for (var si=0; si<switchSels.length; si++) {
-				sPSV(switchSels[si], switchVals[si], "data-preset");
-			}
-		} else {
-			// pushbuttons: short (MP), long (ML) and double (MD) press
-			buttonBlock.innerHTML = `
-				<div class="bh">Button ${i} - ${typeName}</div>
-				<div class="bs">
-					<div class="ba">
-						<label>Short press</label>
-						<select name="MP${b}" class="s" required>${presetOpts}</select>
-					</div>
-					<div class="ba">
-						<label>Long press</label>
-						<select name="ML${b}" class="s" required>${presetOpts}</select>
-					</div>
-					<div class="ba">
-						<label>Double press</label>
-						<select name="MD${b}" class="s" required>${presetOpts}</select>
-					</div>
+				<div class="ba">
+					<label>Long (off→on)</label>
+					<select name="MD${b}" class="s" required>${presetOpts}</select>
 				</div>
-				<hr style="width:100%;margin:8px 0 0 0;">
-			`;
-			var buttonSels = buttonBlock.querySelectorAll("select");
-			var buttonVals = [String(p), String(l), String(d)];
-			for (var si=0; si<buttonSels.length; si++) {
-				sPSV(buttonSels[si], buttonVals[si], "data-preset");
-			}
+			</div>
+			<hr style="width:100%;margin:8px 0 0 0;">
+		`;
+		var buttonSels = buttonBlock.querySelectorAll("select");
+		var buttonVals = [String(p), String(l), String(d)];
+		for (var si=0; si<buttonSels.length; si++) {
+			sPSV(buttonSels[si], buttonVals[si], "data-preset");
 		}
 		gId("macros").appendChild(buttonBlock);
 	}
@@ -47,7 +47,6 @@
 				d.rsvd = [];
 				d.ro_gpio = [];
 				d.extra = [];
-				d.a_pins = []; // analog pins array
 			}, ()=>{
 				if (d.um_p[0]==-1) d.um_p.shift();	// remove filler
 				d.Sf.SDA.max = d.Sf.SCL.max = d.Sf.MOSI.max = d.Sf.SCLK.max = d.Sf.MISO.max = d.max_gpio;
@@ -195,11 +194,7 @@
 			um += ":"+fld;
 		} else if (typeof(fld) === "number") sel.classList.add("pin"); // a hack to add a class
 		let arr = d.getElementsByName(um);
-		if (!arr || arr.length === 0) {
-			console.log("addDD: No elements found for name:", um);
-			return null; // no elements found
-		}
-		let idx = (arr[0] && arr[0].type==="hidden")?1:0; // ignore hidden field
+		let idx = arr[0].type==="hidden"?1:0; // ignore hidden field
 		if (arr.length > 1+idx) {
 			// we have array of values (usually pins)
 			for (let i of arr) {
@@ -261,98 +256,6 @@
 		e.preventDefault();
 		if (d.Sf.checkValidity()) d.Sf.submit(); //https://stackoverflow.com/q/37323914
 	}
-
-	// TODO: rename this function, needs to be in sync with the now out of tree mod
-	function aOpt(name,el) {
-		let obj = d.getElementsByName(name);
-		if (!obj || obj.length === 0) return; // No elements found
-
-		var select = obj;
-		if (obj[el]) select = obj[el];
-
-		// Check if it's actually a select element with options
-		if (!select.options || !select.options.length) return;
-
-		for (let i=0; i<select.options.length; i++) {
-			let c = select.options[i];
-			let found = false;
-			for (let jj=0; jj<d.a_pins.length; jj++) if (d.a_pins[jj] == c.value) found = true; //value -1 or analog pins
-			if (c.value != -1 && !found) {
-				select.removeChild(c);
-				i--; //decrease i by one because the index has been adjusted
-			}
-			//https://www.javascripttutorial.net/javascript-dom/javascript-add-remove-options/
-			//https://www.javascripttutorial.net/javascript-dom/javascript-remove-items-from-a-select-conditionally/
-		}
-	}
-	function rOpt(name,el,txt,val) {
-		let obj = d.getElementsByName(name);
-		if (!obj || obj.length === 0) return; // No elements found
-		var select = obj;
-		if (obj[el]) select = obj[el];
-
-		// Check if element has childNodes
-		if (!select.childNodes || !select.childNodes.length) return;
-
-		for (let i=0; i<select.childNodes.length; i++) {
-			let c = select.childNodes[i];
-			if (c.value == val) c.text = txt;
-		}
-	}
-	function xOpt(name,el,txt,val) {
-		let obj = d.getElementsByName(name);
-		if (!obj || obj.length === 0) return; // No elements found
-		var select = obj;
-		if (obj[el]) select = obj[el];
-
-		// Check if element has childNodes
-		if (!select.childNodes || !select.childNodes.length) return;
-
-		for (let i=0; i<select.childNodes.length; i++) {
-			let c = select.childNodes[i];
-			if (c.value == val) c.text += txt;
-		}
-	}
-	function dOpt(name,el,valFrom,valTo) {
-		let obj = d.getElementsByName(name);
-		if (!obj || obj.length === 0) return; // No elements found
-		var select = obj;
-		if (obj[el]) select = obj[el];
-
-		// Check if it's actually a select element with options
-		if (!select.options || !select.options.length) return;
-
-		for (let i=0; i<select.options.length; i++) {
-			let c = select.options[i];
-			if (c.value >= valFrom && c.value <= valTo) {
-				select.removeChild(c);
-				i--; //decrease i by one because the index has been adjusted
-			}
-			//https://www.javascripttutorial.net/javascript-dom/javascript-add-remove-options/
-			//https://www.javascripttutorial.net/javascript-dom/javascript-remove-items-from-a-select-conditionally/
-		}
-	}
-	function dRO(name,el) {
-		// Initialize d.ro_gpio if not already set
-		if (!d.ro_gpio) d.ro_gpio = [];
-
-		let obj = d.getElementsByName(name);
-		if (!obj || obj.length === 0) return; // No elements found
-
-		var select = obj;
-		if (obj[el]) select = obj[el];
-
-		// Check if it's actually a select element with options
-		if (!select.options || !select.options.length) return;
-
-		// console.log("dRO", name, el, obj, "s", select, d.ro_gpio);
-		for (let i=0; i<select.options.length; i++) {
-			let c = select.options[i];
-			// console.log("dRO option", c, c.value, d.ro_gpio.includes(c.value));
-			for (let j=0; j<d.ro_gpio.length; j++) if (d.ro_gpio[j] == c.value) c.disabled=true; //if (d.ro_gpio.includes(c.value))
-		}
-	}
-
 	</script>
 </head>

@@ -414,11 +414,6 @@ namespace UsermodManager {
 // Register usermods by building a static list via a linker section
 #define REGISTER_USERMOD(x) DYNARRAY_MEMBER(Usermod*, usermods, um_##x, 1) = &x

-//usermod.cpp
-void userSetup();
-void userConnected();
-void userLoop();
-
 //util.cpp
 #ifdef ESP8266
 #define HW_RND_REGISTER RANDOM_REG32
@@ -34,24 +34,13 @@ static File f; // don't export to other cpp files

 //wrapper to find out how long closing takes
 void closeFile() {
-  if (!doCloseFile || !f) { doCloseFile = false; return; }  // file not open, or no request to close -> nothing to do, nothing to wait
  #ifdef WLED_DEBUG_FS
    DEBUGFS_PRINT(F("Close -> "));
    uint32_t s = millis();
  #endif
-  doCloseFile = false; // consume flag early, to reduce the time window for concurrent closing attempts from several tasks.
-
-  // f.close() may enter flash critical sections (interrupts/cache paused), so we wait for LED transmission to finish first to avoid WS281x glitches
-  // This is most relevant on ESP32-C3/C5/C6, where the RMT driver is very sensitive to interrupt timing.
-  bool haveSuspended = false;
-  #if defined(WLED_USE_SHARED_RMT) || defined(__riscv) || !defined(ARDUINO_ARCH_ESP32)
-    if (!strip.isSuspended()) { strip.suspend(); haveSuspended = true; } // prevent that a new strip.show() starts after waiting
-    strip.waitForLEDs(STRIP_WAIT_MEDIUM); // be nice, but not too nice. Waits up to 150ms
-  #endif
-
  f.close(); // "if (f)" check is aleady done inside f.close(), and f cannot be nullptr -> no need for double checking before closing the file handle.
-  if (haveSuspended) strip.resume();  // end of critical section - new LEDs updates are allowed again
  DEBUGFS_PRINTF("took %lu ms\n", millis() - s);
+  doCloseFile = false;
 }

 //find() that reads and buffers data from file stream in 256-byte blocks.
@@ -448,7 +437,6 @@ bool handleFileRead(AsyncWebServerRequest* request, String path){
    }
  }
  #endif
-  strip.waitForLEDs(STRIP_WAIT_SHORT); // wait for LEDs before file access (not using strip.suspend(), to avoid effect stuttering)
  if(WLED_FS.exists(path) || WLED_FS.exists(path + ".gz")) {
    request->send(request->beginResponse(WLED_FS, path, {}, request->hasArg(F("download")), {}));
    return true;
@@ -459,7 +447,6 @@ bool handleFileRead(AsyncWebServerRequest* request, String path){
 // copy a file, delete destination file if incomplete to prevent corrupted files
 bool copyFile(const char* src_path, const char* dst_path) {
  DEBUG_PRINTF("copyFile from %s to %s\n", src_path, dst_path);
-  strip.waitForLEDs(STRIP_WAIT_MEDIUM, true); // wait for LEDs before file access (not using strip.suspend(), to avoid effect stuttering)
  if(!WLED_FS.exists(src_path)) {
   DEBUG_PRINTLN(F("file not found"));
   return false;
@@ -498,7 +485,6 @@ bool copyFile(const char* src_path, const char* dst_path) {
 // compare two files, return true if identical
 bool compareFiles(const char* path1, const char* path2) {
  DEBUG_PRINTF("compareFile %s and %s\n", path1, path2);
-  strip.waitForLEDs(STRIP_WAIT_SHORT); // wait for LEDs before file access (not using strip.suspend(), to avoid effect stuttering)
  if (!WLED_FS.exists(path1) || !WLED_FS.exists(path2)) {
    DEBUG_PRINTLN(F("file not found"));
    return false;
@@ -557,7 +543,6 @@ bool restoreFile(const char* filename) {
  char backupname[32];
  snprintf_P(backupname, sizeof(backupname), s_backup_fmt, filename + 1); // skip leading '/' in filename

-  strip.waitForLEDs(STRIP_WAIT_MEDIUM); // wait for LEDs before file existence checking
  if (!WLED_FS.exists(backupname)) {
    DEBUG_PRINTLN(F("no backup found"));
    return false;
@@ -28,7 +28,10 @@ int fileReadCallback(void) {
 }

 int fileReadBlockCallback(void * buffer, int numberOfBytes) {
-  strip.waitForLEDs(STRIP_WAIT_MEDIUM);
+  #ifdef CONFIG_IDF_TARGET_ESP32C3
+  unsigned t0 = millis();
+  while (strip.isUpdating() && (millis() - t0 < 15)) yield(); // be nice, but not too nice. Waits up to 15ms to avoid glitches
+  #endif
  return file.read((uint8_t*)buffer, numberOfBytes);
 }

@@ -134,7 +137,6 @@ byte renderImageToSegment(Segment &seg) {
      DEBUG_PRINTF_P(PSTR("GIF decoder unsupported file: %s\n"), lastFilename);
      return IMAGE_ERROR_UNSUPPORTED_FORMAT;
    }
-    strip.waitForLEDs(STRIP_WAIT_MEDIUM);
    if (file) file.close();
    if (!openGif(lastFilename)) {
      gifDecodeFailed = true;
@@ -116,8 +116,8 @@ void handleImprovPacket() {
            return;
          }
        } else if (packetByte > 9) { //RPC data
-          if (packetByte > 137) return; //prevent buffer overflow
          rpcData[packetByte - 10] = next;
+          if (packetByte > 137) return; //prevent buffer overflow
        }
      }
    }
@@ -238,8 +238,8 @@ void handleImprovWifiScan() {
    bool isOpen = WiFi.encryptionType(i) == WIFI_AUTH_OPEN;
    #endif

-    char ssidStr[33] = {'\0'};
-    strlcpy(ssidStr, WiFi.SSID(i).c_str(), sizeof(ssidStr));
+    char ssidStr[33];
+    strcpy(ssidStr, WiFi.SSID(i).c_str());
    const char *str[3] = {ssidStr, rssiStr, isOpen ? "NO":"YES"};
    sendImprovRPCResult(ImprovRPCType::Request_Scan, 3, str);
  }
@@ -258,13 +258,14 @@ static void parseWiFiCommand(char* rpcData) {

  unsigned ssidLen = rpcData[1];
  if (ssidLen > len -1 || ssidLen > 32) return;
-  memset(multiWiFi[0].clientSSID, 0, sizeof(multiWiFi[0].clientSSID));
+  memset(multiWiFi[0].clientSSID, 0, 32);
  memcpy(multiWiFi[0].clientSSID, rpcData+2, ssidLen);

-  memset(multiWiFi[0].clientPass, 0, sizeof(multiWiFi[0].clientPass));
+  memset(multiWiFi[0].clientPass, 0, 64);
  if (len > ssidLen +1) {
    unsigned passLen = rpcData[2+ssidLen];
-    memcpy(multiWiFi[0].clientPass, rpcData+3+ssidLen, min(size_t(passLen), sizeof(multiWiFi[0].clientPass)));
+    memset(multiWiFi[0].clientPass, 0, 64);
+    memcpy(multiWiFi[0].clientPass, rpcData+3+ssidLen, passLen);
  }

  sendImprovStateResponse(0x03); //provisioning
@@ -849,8 +849,6 @@ void serializeInfo(JsonObject root)
  root[F("lwip")] = LWIP_VERSION_MAJOR;
 #endif

-  // calling ESP.getFreeHeap() during led update causes glitches on C3 and possibly on 8266, too
-  strip.waitForLEDs(STRIP_WAIT_SHORT); // be nice, but not too nice. Waits up to 50ms. No need to suspend effects - ESP.getFreeHeap() will not need much time
  root[F("freeheap")] = getFreeHeapSize();
  #if defined(ARDUINO_ARCH_ESP32) && defined(BOARD_HAS_PSRAM)
  // Report PSRAM information
@@ -239,7 +239,6 @@ static bool beginOTA(AsyncWebServerRequest *request, UpdateContext* context)
  UsermodManager::onUpdateBegin(true); // notify usermods that update is about to begin (some may require task de-init)

  strip.suspend();
-  strip.waitForLEDs(STRIP_WAIT_MEDIUM, true);  // always wait for LED transmissions to finish
  backupConfig(); // backup current config in case the update ends badly
  strip.resetSegments();  // free as much memory as you can
  context->needsRestart = true;
@@ -760,7 +759,6 @@ bool initBootloaderOTA(AsyncWebServerRequest *request) {
  #endif
  lastEditTime = millis(); // make sure PIN does not lock during update
  strip.suspend();
-  strip.waitForLEDs(STRIP_WAIT_SHORT, true);   // be sure that LED transmissions have finished
  strip.resetSegments();

  // Check available heap before attempting allocation
@@ -6,7 +6,7 @@

 #define UDP_SEG_SIZE 36
 #define SEG_OFFSET (41)
-static constexpr size_t WLEDPACKETSIZE = 41+(WS2812FX::getMaxSegments()*UDP_SEG_SIZE);  // make sure this is known at compile-time
+#define WLEDPACKETSIZE (41+(WS2812FX::getMaxSegments()*UDP_SEG_SIZE)+0)
 #define UDP_IN_MAXSIZE 1472
 #define PRESUMED_NETWORK_DELAY 3 //how many ms could it take on avg to reach the receiver? This will be added to transmitted times

@@ -268,7 +268,6 @@ static void parseNotifyPacket(const uint8_t *udpIn) {
    size_t inactiveSegs = 0;
    for (size_t i = 0; i < numSrcSegs && i < WS2812FX::getMaxSegments(); i++) {
      unsigned ofs = 41 + i*udpIn[40]; //start of segment offset byte
-      if (ofs + 36 > UDP_IN_MAXSIZE) break; // avoid reading outside of array
      unsigned id = udpIn[0 +ofs];
      DEBUG_PRINTF_P(PSTR("UDP segment received: %u\n"), id);
      if      (id >  strip.getSegmentsNum()) break;
@@ -500,7 +499,7 @@ void handleNotifications()
    packetSize = rgbUdp.parsePacket();
    if (packetSize) {
      if (!receiveDirect) return;
-      if (packetSize > UDP_IN_MAXSIZE || packetSize < 3) return;  // packetSize must not exceed buffersize (UDP_IN_MAXSIZE)
+      if (packetSize > UDP_IN_MAXSIZE || packetSize < 3) return;
      realtimeIP = rgbUdp.remoteIP();
      DEBUG_PRINTLN(rgbUdp.remoteIP());
      uint8_t lbuf[packetSize];
@@ -588,9 +587,7 @@ void handleNotifications()

      unsigned id = (tpmPayloadFrameSize/3)*(packetNum-1); //start LED
      unsigned totalLen = strip.getLengthTotal();
-      // Clamp to prevent buffer overread: loop accesses up to udpIn[tpmPayloadFrameSize + 5]
-      size_t currentPayloadFrameSize = (packetSize >= 5) ? min(tpmPayloadFrameSize, uint16_t(packetSize - 5)) : 0;
-      for (size_t i = 6; i < currentPayloadFrameSize + 4U && id < totalLen; i += 3, id++) {
+      for (size_t i = 6; i < tpmPayloadFrameSize + 4U && id < totalLen; i += 3, id++) {
        setRealtimePixel(id, udpIn[i], udpIn[i+1], udpIn[i+2], 0);
      }
      if (tpmPacketCount == numPackets) { //reset packet count and show if all packets were received
@@ -1,29 +0,0 @@
-#include "wled.h"
-/*
- * This v1 usermod file allows you to add own functionality to WLED more easily
- * See: https://github.com/wled-dev/WLED/wiki/Add-own-functionality
- * EEPROM bytes 2750+ are reserved for your custom use case. (if you extend #define EEPSIZE in const.h)
- * If you just need 8 bytes, use 2551-2559 (you do not need to increase EEPSIZE)
- *
- * Consider the v2 usermod API if you need a more advanced feature set!
- */
-
-//Use userVar0 and userVar1 (API calls &U0=,&U1=, uint16_t)
-
-//gets called once at boot. Do all initialization that doesn't depend on network here
-void userSetup()
-{
-
-}
-
-//gets called every time WiFi is (re-)connected. Initialize own network interfaces here
-void userConnected()
-{
-
-}
-
-//loop. You can use "if (WLED_CONNECTED)" to check for successful connection
-void userLoop()
-{
-
-}
@@ -1296,9 +1296,6 @@ String computeSHA1(const String& input) {

 #ifdef ESP32
 #include "esp_adc_cal.h"
-#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4,4,7) // backwards compatibility patch
-  #define ADC_ATTEN_DB_12 ADC_ATTEN_DB_11
-#endif
 String generateDeviceFingerprint() {
  uint32_t fp[2] = {0, 0}; // create 64 bit fingerprint
  esp_chip_info_t chip_info;
@@ -78,7 +78,6 @@ void WLED::loop()
  #ifdef WLED_DEBUG
  unsigned long usermodMillis = millis();
  #endif
-  userLoop();
  UsermodManager::loop();
  #ifdef WLED_DEBUG
  usermodMillis = millis() - usermodMillis;
@@ -174,9 +173,12 @@ void WLED::loop()
    #ifdef ESP8266
    uint32_t heap = getFreeHeapSize(); // ESP8266 needs ~8k of free heap for UI to work properly
    #else
+    #ifdef CONFIG_IDF_TARGET_ESP32C3
    // calling getContiguousFreeHeap() during led update causes glitches on C3
    // this can (probably) be removed once RMT driver for C3 is fixed
-    strip.waitForLEDs(STRIP_WAIT_MEDIUM);  // be nice, but not too nice. Waits up to 150ms - we are in the main loop, so a new strip.show() cannot start while waiting
+    unsigned t0 = millis();
+    while (strip.isUpdating() && (millis() - t0 < 15)) delay(1);    // be nice, but not too nice. Waits up to 15ms
+    #endif
    uint32_t heap = getContiguousFreeHeap(); // ESP32 family needs ~10k of contiguous free heap for UI to work properly
    #endif
    if (heap < MIN_HEAP_SIZE - 1024) heapDanger+=5; // allow 1k of "wiggle room" for things that do not respect min heap limits
@@ -491,11 +493,9 @@ void WLED::setup()

  DEBUG_PRINTLN(F("Initializing strip"));
  beginStrip();
-  strip.waitForLEDs(STRIP_WAIT_MEDIUM); // prevent flickering - beginStrip() calls strip.show()
  DEBUG_PRINTF_P(PSTR("heap %u\n"), getFreeHeapSize());

  DEBUG_PRINTLN(F("Usermods setup"));
-  userSetup();
  UsermodManager::setup();
  DEBUG_PRINTF_P(PSTR("heap %u\n"), getFreeHeapSize());

@@ -596,7 +596,7 @@ void WLED::setup()
  #endif

  #if defined(ARDUINO_ARCH_ESP32) && defined(WLED_DISABLE_BROWNOUT_DET)
-  WRITE_PERI_REG(RTC_CNTL_BROWN_OUT_REG, 1); //re-enable brownout detector
+  WRITE_PERI_REG(RTC_CNTL_BROWN_OUT_REG, 1); //enable brownout detector
  #endif
  markOTAvalid();
 }
@@ -978,7 +978,6 @@ void WLED::handleConnection()
      if (improvActive > 1) sendImprovIPRPCResult(ImprovRPCType::Command_Wifi);
    }
    initInterfaces();
-    userConnected();
    UsermodManager::connected();
    lastMqttReconnectAttempt = 0; // force immediate update

@@ -274,7 +274,7 @@ using PSRAMDynamicJsonDocument = BasicJsonDocument<PSRAM_Allocator>;
 #define STRINGIFY(X) #X
 #define TOSTRING(X) STRINGIFY(X)

-#define WLED_CODENAME "Kagayaki"
+#define WLED_CODENAME "Niji"

 // AP and OTA default passwords (for maximum security change them!)
 WLED_GLOBAL char apPass[65]  _INIT(WLED_AP_PASS);
@@ -212,14 +212,7 @@ static void handleUpload(AsyncWebServerRequest *request, const String& filename,
    request->_tempFile.write(data,len);
  }
  if (isFinal) {
-    bool haveSuspended = false;
-    #if defined(WLED_USE_SHARED_RMT) || defined(__riscv) || !defined(ARDUINO_ARCH_ESP32)
-      if (!strip.isSuspended()) { strip.suspend(); haveSuspended = true; } // prevent that a new strip.show() starts after waiting
-      strip.waitForLEDs(STRIP_WAIT_SHORT, true); // calling file.close() during LEDs sendout can cause glitches on C3 and on 8266
-    #endif
    request->_tempFile.close();
-    if (haveSuspended) strip.resume();
-
    if (filename.indexOf(F("cfg.json")) >= 0) { // check for filename with or without slash
      doReboot = true;
      request->send(200, FPSTR(CONTENT_TYPE_PLAIN), F("Config restore ok.\nRebooting..."));
@@ -153,7 +153,6 @@ void sendDataWs(AsyncWebSocketClient * client)
  DEBUG_PRINTF_P(PSTR("JSON buffer size: %u for WS request (%u).\n"), pDoc->memoryUsage(), len);

  // the following may no longer be necessary as heap management has been fixed by @willmmiles in AWS
-  strip.waitForLEDs(STRIP_WAIT_VERYSHORT); // wait for LEDs ouptut to finish - prevents glitches on -C3
  size_t heap1 = getFreeHeapSize();
  DEBUG_PRINTF_P(PSTR("heap %u\n"), getFreeHeapSize());
  AsyncWebSocketBuffer buffer(len);
@@ -628,7 +628,7 @@ void getSettingsJS(byte subPage, Print& settingsScript)
    printSetFormValue(settingsScript,PSTR("MN"),macroNl);
    int ii = 0;
    for (const auto &button : buttons) {
-      settingsScript.printf_P(PSTR("addRow(%d,%d,%d,%d,%d);"), ii++, button.macroButton, button.macroLongPress, button.macroDoublePress, button.type);
+      settingsScript.printf_P(PSTR("addRow(%d,%d,%d,%d);"), ii++, button.macroButton, button.macroLongPress, button.macroDoublePress);
    }

    settingsScript.printf_P(PSTR("maxTimers=%d;"), WLED_MAX_TIMERS);
Author	SHA1	Message	Date
Frank Möhle	1795797e0e	Merge branch 'main' into remove-v1-usermod	2026-05-29 15:01:16 +02:00
Will Tatam	0a21869362	Remove V1 usermod	2025-08-09 15:22:41 +01:00