Particle system and segment/effect blending

.gitignore

@@ -15,6 +15,7 @@ wled-update.sh
 
 /build_output/
 /node_modules/
+/logs/
 
 /wled00/extLibs
 /wled00/LittleFS

CHANGELOG.md

@@ -173,7 +173,7 @@
 -   v0.15.0-b2
 -   WS2805 support (RGB + WW + CW, 600kbps)
 -   Unified PSRAM use
--   NeoPixelBus v2.7.9
+-   NeoPixelBus v2.7.9 (for future WS2805 support)
 -   Ubiquitous PSRAM mode for all variants of ESP32
 -   SSD1309_64 I2C Support for FLD Usermod (#3836 by @THATDONFC)
 -   Palette cycling fix (add support for `{"seg":[{"pal":"X~Y~"}]}` or `{"seg":[{"pal":"X~Yr"}]}`)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wled",
-  "version": "0.15.0-b7",
+  "version": "0.15.1-b1",
   "description": "Tools for WLED project",
   "main": "tools/cdata.js",
   "directories": {
@@ -27,5 +27,8 @@
     "html-minifier-terser": "^7.2.0",
     "inliner": "^1.13.1",
     "nodemon": "^3.1.7"
+  },
+  "engines": {
+    "node": ">=20.0.0"
   }
 }

pio-scripts/output_bins.py

@@ -19,8 +19,9 @@ def _create_dirs(dirs=["map", "release", "firmware"]):
         os.makedirs(os.path.join(OUTPUT_DIR, d), exist_ok=True)
 
 def create_release(source):
-    release_name = _get_cpp_define_value(env, "WLED_RELEASE_NAME")
-    if release_name:
+    release_name_def = _get_cpp_define_value(env, "WLED_RELEASE_NAME")
+    if release_name_def:
+        release_name = release_name_def.replace("\\\"", "")
         version = _get_cpp_define_value(env, "WLED_VERSION")
         release_file = os.path.join(OUTPUT_DIR, "release", f"WLED_{version}_{release_name}.bin")
         release_gz_file = release_file + ".gz"

pio-scripts/set_version.py

@@ -1,5 +1,8 @@
 Import('env')
 import json
+import datetime
+t = datetime.datetime.now()
+env.Append(BUILD_FLAGS=[f"-D BUILD={t.strftime('%y%m%d')}0"])
 
 PACKAGE_FILE = "package.json"
 

platformio_override.sample.ini

@@ -95,7 +95,14 @@ build_flags = ${common.build_flags} ${esp8266.build_flags}
 ;   -D WLED_WATCHDOG_TIMEOUT=10
 ;
 ; Create debug build (with remote debug)
+;   -D WLED_DEBUG_ALL ;; or
 ;   -D WLED_DEBUG
+;   -D WLED_DEBUG_FS
+;   -D WLED_DEBUG_FX
+;   -D WLED_DEBUG_BUS
+;   -D WLED_DEBUG_PINMANAGER
+;   -D WLED_DEBUG_USERMODS
+;   -D WLED_DEBUG_MATH
 ;   -D WLED_DEBUG_HOST='"192.168.0.100"'
 ;   -D WLED_DEBUG_PORT=7868
 ;
@@ -216,7 +223,7 @@ board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} ${esp8266.build_flags}
 lib_deps = ${esp8266.lib_deps}
-monitor_filters = esp8266_exception_decoder
+monitor_filters = esp8266_exception_decoder #, log2file
 
 [env:heltec_wifi_kit_8]
 board = d1_mini
@@ -243,7 +250,7 @@ platform_packages = ${esp32.platform_packages}
 build_unflags = ${common.build_unflags}
 build_flags = ${common.build_flags} ${esp32.build_flags} #-D WLED_DISABLE_BROWNOUT_DET
 lib_deps = ${esp32.lib_deps}
-monitor_filters = esp32_exception_decoder
+monitor_filters = esp32_exception_decoder #, log2file
 board_build.partitions = ${esp32.default_partitions}
 board_build.f_flash = 80000000L
 board_build.flash_mode = qio
@@ -258,7 +265,7 @@ platform_packages = ${esp32_idf_V4.platform_packages}
 build_unflags = ${common.build_unflags}
 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
+monitor_filters = esp32_exception_decoder #, log2file
 board_build.partitions = ${esp32_idf_V4.default_partitions}
 board_build.f_flash = 80000000L
 board_build.flash_mode = dio
@@ -284,6 +291,33 @@ extends = env:esp32s3dev_8MB_PSRAM_opi
 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:esp32S3_wroom2]
+;; For ESP32-S3 WROOM-2, a.k.a. ESP32-S3 DevKitC-1 v1.1
+;; with >= 16MB FLASH and >= 8MB PSRAM (memory_type: opi_opi)
+platform = ${esp32s3.platform}
+platform_packages = ${esp32s3.platform_packages}
+board = esp32s3camlcd ;; this is the only standard board with "opi_opi"
+board_build.arduino.memory_type = opi_opi
+upload_speed = 921600
+build_unflags = ${common.build_unflags}
+build_flags = ${common.build_flags} ${esp32s3.build_flags} -D WLED_RELEASE_NAME=ESP32-S3_WROOM-2
+  -D CONFIG_LITTLEFS_FOR_IDF_3_2 -D WLED_WATCHDOG_TIMEOUT=0
+  -D ARDUINO_USB_CDC_ON_BOOT=0  ;; -D ARDUINO_USB_MODE=1 ;; for boards with serial-to-USB chip
+  ;; -D ARDUINO_USB_CDC_ON_BOOT=1 -D ARDUINO_USB_MODE=1      ;; for boards with USB-OTG connector only (USBCDC or "TinyUSB")
+  -DBOARD_HAS_PSRAM
+  -D LEDPIN=38 -D DATA_PINS=38 ;; buildin WS2812b LED
+  -D BTNPIN=0 -D RLYPIN=16 -D IRPIN=17 -D AUDIOPIN=-1
+  -D WLED_DEBUG
+  ${esp32.AR_build_flags}
+  -D SR_DMTYPE=1 -D I2S_SDPIN=13 -D I2S_CKPIN=14 -D I2S_WSPIN=15 -D MCLK_PIN=4  ;; I2S mic
+lib_deps = ${esp32s3.lib_deps}
+  ${esp32.AR_lib_deps}
+
+board_build.partitions = ${esp32.extreme_partitions}
+board_upload.flash_size = 16MB
+board_upload.maximum_size = 16777216
+monitor_filters = esp32_exception_decoder #, log2file
+
 [env:esp8285_4CH_MagicHome]
 board = esp8285
 platform = ${common.platform_wled_default}
@@ -514,8 +548,19 @@ build_flags = ${common.build_flags} ${esp32.build_flags} -D WLED_DISABLE_BROWNOU
   -D TFT_RST=26
   -D SPI_FREQUENCY=40000000
   -D USER_SETUP_LOADED
-monitor_filters = esp32_exception_decoder
+monitor_filters = esp32_exception_decoder #, log2file
+board_build.partitions = ${esp32.default_partitions}
 lib_deps =
   ${esp32.lib_deps}
-  TFT_eSPI @ ^2.3.70
-board_build.partitions = ${esp32.default_partitions}
+  TFT_eSPI @ 2.5.33  ;; this is the last version that compiles with the WLED default framework - newer versions require platform = espressif32 @ ^6.3.2
+
+# ------------------------------------------------------------------------------
+# Usermod examples
+# ------------------------------------------------------------------------------
+
+# 433MHz RF remote example for esp32dev
+[env:esp32dev_usermod_RF433]
+extends = env:esp32dev
+build_flags = ${env:esp32dev.build_flags} -D USERMOD_RF433
+lib_deps = ${env:esp32dev.lib_deps}
+  sui77/rc-switch @ 2.6.4

tools/c3g-2-cpp.py

@@ -0,0 +1,172 @@
+"""
+ChatGPT genrated code to convert .c3g (cpt-city palette in CSS3 format) file to C++ array for FastLED CRGBPalette16 generation.
+Download palette files from http://seaviewsensing.com/pub/cpt-city/
+"""
+# Usage: python c3g-2-cpp.py <c3g_file_path> [<array_name>]
+
+import argparse
+import re
+import os
+import requests
+
+def rgb_to_tuple(rgb_str):
+    """
+    Convert a CSS3 rgb(r, g, b) string to an (R, G, B) tuple.
+    Example: "rgb(255, 0, 0)" -> (255, 0, 0)
+    """
+    match = re.match(r'rgb\(\s*(\d+),\s*(\d+),\s*(\d+)\)', rgb_str)
+    if match:
+        r = int(match.group(1))
+        g = int(match.group(2))
+        b = int(match.group(3))
+        return r, g, b
+    else:
+        raise ValueError(f"Invalid RGB format: {rgb_str}")
+
+def extract_colors_from_gradient(gradient):
+    """
+    Extract all color codes and their positions from a CSS3 linear-gradient string.
+    Example: "linear-gradient(0deg, rgb(252,216,252) 0.000%, rgb(255,192,255) 18.990%, ...)"
+    -> [("rgb(252,216,252)", 0.0), ("rgb(255,192,255)", 18.990), ...]
+    """
+    # Regex to match the colors in rgb(r, g, b) format and their positions
+    color_position_regex = r'rgb\(\s*(\d+),\s*(\d+),\s*(\d+)\)\s*(\d+\.\d+)%'
+
+    # Find all colors and their positions in the gradient string
+    return [(f'rgb({r}, {g}, {b})', float(position)) for r, g, b, position in re.findall(color_position_regex, gradient)]
+
+def position_to_index(position):
+    """
+    Convert a percentage position in the gradient (0.0 to 100.0) to an index in a 0-255 range.
+    The range of 0% to 100% is divided into 256 sections (for a palette of size 256).
+    """
+    return int(position / 100 * 255)  # Maps 0.0% to index 0, 100.0% to index 255
+
+def c3g_to_cpp_array(c3g_file_path, array_name):
+    # Open the .c3g file
+    with open(c3g_file_path, 'r') as f:
+        lines = f.readlines()
+
+    # Initialize an empty list for the colors
+    color_array = []
+
+    # Process each line in the file
+    for line in lines:
+        # Remove comments (single-line and block comments)
+        line = re.sub(r'//.*$', '', line)  # Remove single-line comments
+        line = re.sub(r'/\*.*?\*/', '', line, flags=re.DOTALL)  # Remove block comments
+
+        # Strip any extra whitespace
+        line = line.strip()
+
+        # Skip empty lines
+        if not line:
+            continue
+
+        # If the line contains a linear-gradient, extract the colors and positions
+        if 'rgb(' in line:
+            # Extract the gradient colors and their positions
+            color_positions = extract_colors_from_gradient(line)
+            # Convert each color to RGB and map it to the appropriate index
+            for color, position in color_positions:
+                r, g, b = rgb_to_tuple(color)
+                index = position_to_index(position)
+                color_array.append(f"{index:>3}, {r:>3}, {g:>3}, {b:>3}")
+
+    # Format the final C++ array string with the custom array name
+    cpp_array = f"const uint8_t {array_name}[] PROGMEM = {{\n  " + ",\n  ".join(color_array) + "};"
+
+    return cpp_array
+
+
+def download_file(url, save_path):
+    """
+    Download a file from a URL and save it to a specified path.
+    """
+    try:
+        response = requests.get(url)
+        response.raise_for_status()  # Raise an error for bad status codes
+        with open(save_path, 'wb') as f:
+            f.write(response.content)
+        #print(f"Downloaded {url} to {save_path}")
+    except requests.exceptions.RequestException as e:
+        print(f"Error downloading {url}: {e}")
+
+def process_urls_from_file(url_file, array_name=None):
+    """
+    Process each URL from a file, download the corresponding .c3g file,
+    and convert it to a C++ array.
+    """
+    with open(url_file, 'r') as f:
+        urls = f.readlines()
+
+    # For each URL, download the file and convert it
+    for url in urls:
+        url = url.strip()  # Remove any leading/trailing whitespace or newlines
+        if not url:
+            continue
+
+        # Extract file name from the URL or use a default name
+        file_name = os.path.basename(url)
+        if not file_name.endswith('.c3g'):
+            file_name += '.c3g'
+
+        # Download the file
+        download_file(url, file_name)
+
+        if not os.path.exists(file_name):
+            continue
+
+        # Determine array name (use provided array name or file name without extension)
+        if array_name is None:
+            array_name = os.path.splitext(file_name)[0] + '_gp'
+
+        # Convert the .c3g file to C++ array
+        cpp_code = c3g_to_cpp_array(file_name, array_name)
+        print(f"// Gradient palette \"{array_name}\", originally from")
+        print(f"// {url}")
+        print(cpp_code)
+        print()  # Empty line between outputs
+
+        array_name = None
+
+        # Optionally, you can save the C++ code to a file
+        # with open(f"{array_name}_palette.cpp", 'w') as f:
+        #     f.write(cpp_code)
+        os.remove(file_name)  # Remove the downloaded file after processing
+
+
+def main():
+    # Create the parser object
+    parser = argparse.ArgumentParser(description="Convert .c3g file with gradients to a C++ array for FastLED.")
+
+    # Add command-line argument for the .c3g file
+    parser.add_argument("c3g_file", help="Path to the .c3g file to be converted or .txt file with URLs")
+    parser.add_argument("array_name", nargs="?", help="Name of the C++ array to be generated")
+
+    # Parse arguments
+    args = parser.parse_args()
+
+
+    if args.c3g_file.endswith('.c3g'):
+        # If no array name is provided, use the file name without extension as the array name
+        if not args.array_name:
+            array_name = os.path.splitext(os.path.basename(args.c3g_file))[0]
+        else:
+            array_name = args.array_name
+
+        # Call the function to process the file and convert to C++ array format
+        cpp_palette_code = c3g_to_cpp_array(args.c3g_file, array_name)
+
+        # Output the result to the console
+        print(f"// Gradient palette \"{array_name}\", originally from")
+        print(f"// {args.c3g_file}")
+        print(cpp_palette_code)
+
+    else:
+        # Process URLs from the provided text file
+        process_urls_from_file(args.c3g_file, args.array_name)
+
+
+if __name__ == "__main__":
+    main()

tools/cdata.js

@@ -101,6 +101,7 @@ function adoptVersionAndRepo(html) {
 async function minify(str, type = "plain") {
   const options = {
     collapseWhitespace: true,
+    conservativeCollapse: true, // preserve spaces in text
     collapseBooleanAttributes: true,
     collapseInlineTagWhitespace: true,
     minifyCSS: true,