fastled 1.1.24__tar.gz → 1.1.26__tar.gz

{fastled-1.1.24 → fastled-1.1.26}/.github/workflows/build_multi_docker_image.yml

@@ -1,107 +1,142 @@
-name: Build and Push Multi Docker Image
-
-on:
-  push:
-    branches:
-      - main  # Adjust this to your default branch
-  schedule:
-    - cron: '0 12 * * *'  # Executes every day at 4:00 AM Pacific Time
-
-env:
-  REGISTRY_IMAGE: niteris/fastled-wasm  # Replace with your Docker Hub username and repository
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
-    steps:
-      - name: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV          
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY_IMAGE }}
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build and push by digest
-        id: build
-        uses: docker/build-push-action@v6
-        with:
-          platforms: ${{ matrix.platform }}
-          context: https://github.com/fastled/fastled.git
-          file: src/platforms/wasm/compiler/Dockerfile
-          labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
-          build-args: |
-            PLATFORM_TAG=${{ matrix.platform == 'linux/arm64' && '-arm64' || '' }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max,compression=zstd
-      - name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-            name: digests-${{ env.PLATFORM_PAIR }}
-            path: /tmp/digests/*
-            if-no-files-found: error
-            retention-days: 1
-  
-  merge:
-    runs-on: ubuntu-latest
-    needs:
-      - build
-    steps:
-      - name: Download digests
-        uses: actions/download-artifact@v4
-        with:
-          path: /tmp/digests
-          pattern: digests-*
-          merge-multiple: true
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY_IMAGE }}
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Create manifest list and push
-        working-directory: /tmp/digests
-        run: |
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
-
-      - name: Inspect image
-        run: |
-          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
-
-      - name: Redeploy FastLED web service
-        run: |
-          curl ${{ secrets.FASTLED_REDEPLOY_URL }}
-      
+name: Build and Push Multi Docker Image
+
+on:
+  push:
+    branches:
+      - main  # Adjust this to your default branch
+  schedule:
+    - cron: '0 12 * * *'  # Executes every day at 4:00 AM Pacific Time
+
+env:
+  REGISTRY_IMAGE: niteris/fastled-wasm  # Replace with your Docker Hub username and repository
+
+jobs:
+  check-if-changed:
+    runs-on: ubuntu-latest
+    outputs:
+      should_run: ${{ steps.check.outputs.should_run }}
+    steps:
+      - name: Check workflow repo changes
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+      - name: Check FastLED repo
+        uses: actions/checkout@v4
+        with:
+          repository: fastled/fastled
+          path: fastled
+      - id: check
+        run: |
+          # Check if there are any changes in workflow repository
+          WORKFLOW_CHANGED=$(git diff --quiet HEAD^1 HEAD || echo "changed")
+          
+          # Check FastLED repo for changes in last 24 hours
+          cd fastled
+          FASTLED_CHANGED=$(git log --since="24 hours ago" --oneline | wc -l)
+          
+          if [[ -n "$WORKFLOW_CHANGED" ]] || [[ "$FASTLED_CHANGED" -gt 0 ]]; then
+            echo "Changes detected in workflow repository or FastLED in last 24h"
+            echo "should_run=true" >> $GITHUB_OUTPUT
+          else
+            echo "No recent changes detected"
+            echo "should_run=false" >> $GITHUB_OUTPUT
+          fi
+
+  build:
+    needs: check-if-changed
+    if: needs.check-if-changed.outputs.should_run == 'true'
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm64
+    steps:
+      - name: Prepare
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV          
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build and push by digest
+        id: build
+        uses: docker/build-push-action@v6
+        with:
+          platforms: ${{ matrix.platform }}
+          context: https://github.com/fastled/fastled.git
+          file: src/platforms/wasm/compiler/Dockerfile
+          labels: ${{ steps.meta.outputs.labels }}
+          outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
+          build-args: |
+            PLATFORM_TAG=${{ matrix.platform == 'linux/arm64' && '-arm64' || '' }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max,compression=zstd
+      - name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+      - name: Upload digest
+        uses: actions/upload-artifact@v4
+        with:
+            name: digests-${{ env.PLATFORM_PAIR }}
+            path: /tmp/digests/*
+            if-no-files-found: error
+            retention-days: 1
+  
+  merge:
+    runs-on: ubuntu-latest
+    needs:
+      - check-if-changed
+      - build
+    if: needs.check-if-changed.outputs.should_run == 'true'
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: /tmp/digests
+          pattern: digests-*
+          merge-multiple: true
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
+
+      - name: Redeploy FastLED web service
+        run: |
+          curl ${{ secrets.FASTLED_REDEPLOY_URL }}
+      

{fastled-1.1.24 → fastled-1.1.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.1.24
+Version: 1.1.26
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -161,8 +161,12 @@ A: `delay()` will block `loop()` which blocks the main thread of the browser. Th
 Q: How can I get the compiled size of my FastLED sketch smaller?
 A: A big chunk of space is being used by unnecessary javascript `emscripten` is  bundling. This can be tweeked by the wasm_compiler_settings.py file in the FastLED repo.
 
-# Revisions
 
+
+# Revisions
+  
+  * 1.1.26 - Fixed `--interactive` so that it now works correctly.
+  * 1.1.25 - Improved detecting which sketch directory the user means by fuzzy matching.
   * 1.1.24 - Adds progress spinning bar for pulling images, which take a long time.
   * 1.1.23 - Various fixes for MacOS
   * 1.1.22 - Selecting sketch now allows strings and narrowing down paths if ambiguity

{fastled-1.1.24 → fastled-1.1.26}/README.md

@@ -138,8 +138,12 @@ A: `delay()` will block `loop()` which blocks the main thread of the browser. Th
 Q: How can I get the compiled size of my FastLED sketch smaller?
 A: A big chunk of space is being used by unnecessary javascript `emscripten` is  bundling. This can be tweeked by the wasm_compiler_settings.py file in the FastLED repo.
 
-# Revisions
 
+
+# Revisions
+  
+  * 1.1.26 - Fixed `--interactive` so that it now works correctly.
+  * 1.1.25 - Improved detecting which sketch directory the user means by fuzzy matching.
   * 1.1.24 - Adds progress spinning bar for pulling images, which take a long time.
   * 1.1.23 - Various fixes for MacOS
   * 1.1.22 - Selecting sketch now allows strings and narrowing down paths if ambiguity

{fastled-1.1.24 → fastled-1.1.26}/examples/wasm/wasm.ino

@@ -1,131 +1,138 @@
-/// @file    NoisePlusPalette.ino
-/// @brief   Demonstrates how to mix noise generation with color palettes on a
-/// 2D LED matrix
-/// @example NoisePlusPalette.ino
-
-// printf
-#include <stdio.h>
-#include <string>
-
-#include <FastLED.h>
-#include "fx/2d/noisepalette.hpp"
-#include "json.h"
-#include "slice.h"
-#include "fx/fx_engine.h"
-
-#include "fx/2d/animartrix.hpp"
-#include "ui.h"
-
-
-#define LED_PIN 3
-#define BRIGHTNESS 96
-#define COLOR_ORDER GRB
-
-#define MATRIX_WIDTH 100
-#define MATRIX_HEIGHT 100
-#define GRID_SERPENTINE false
-
-#define NUM_LEDS (MATRIX_WIDTH * MATRIX_HEIGHT)
-
-// This example combines two features of FastLED to produce a remarkable range
-// of effects from a relatively small amount of code.  This example combines
-// FastLED's color palette lookup functions with FastLED's Perlin noise
-// generator, and the combination is extremely powerful.
-//
-// You might want to look at the "ColorPalette" and "Noise" examples separately
-// if this example code seems daunting.
-//
-//
-// The basic setup here is that for each frame, we generate a new array of
-// 'noise' data, and then map it onto the LED matrix through a color palette.
-//
-// Periodically, the color palette is changed, and new noise-generation
-// parameters are chosen at the same time.  In this example, specific
-// noise-generation values have been selected to match the given color palettes;
-// some are faster, or slower, or larger, or smaller than others, but there's no
-// reason these parameters can't be freely mixed-and-matched.
-//
-// In addition, this example includes some fast automatic 'data smoothing' at
-// lower noise speeds to help produce smoother animations in those cases.
-//
-// The FastLED built-in color palettes (Forest, Clouds, Lava, Ocean, Party) are
-// used, as well as some 'hand-defined' ones, and some proceedurally generated
-// palettes.
-
-// Scale determines how far apart the pixels in our noise matrix are.  Try
-// changing these values around to see how it affects the motion of the display.
-// The higher the value of scale, the more "zoomed out" the noise iwll be.  A
-// value of 1 will be so zoomed in, you'll mostly see solid colors.
-#define SCALE 20
-
-// We're using the x/y dimensions to map to the x/y pixels on the matrix.  We'll
-// use the z-axis for "time".  speed determines how fast time moves forward. Try
-// 1 for a very slow moving effect, or 60 for something that ends up looking
-// like water.
-#define SPEED 30
-
-CRGB leds[NUM_LEDS];
-XYMap xyMap = XYMap::constructRectangularGrid(MATRIX_WIDTH, MATRIX_HEIGHT);
-NoisePalette noisePalette = NoisePalette(xyMap);
-
-Title title("FastLED Wasm Demo");
-Description description("This example combines two features of FastLED to produce a remarkable range of effects from a relatively small amount of code.  This example combines FastLED's color palette lookup functions with FastLED's Perlin noise generator, and the combination is extremely powerful.");
-
-Slider brightness("Brightness", 255, 0, 255);
-Checkbox isOff("Off", false);
-Slider speed("Noise - Speed", 15, 1, 50);
-Checkbox changePallete("Noise - Auto Palette", true);
-Slider changePalletTime("Noise - Time until next random Palette", 5, 1, 100);
-Slider scale( "Noise - Scale", 20, 1, 100);
-Button changePalette("Noise - Next Palette");
-Button changeFx("Switch between Noise & Animartrix");
-NumberField fxIndex("Animartrix - iex", 0, 0, NUM_ANIMATIONS);
-
-Animartrix animartrix(xyMap, POLAR_WAVES);
-FxEngine fxEngine(NUM_LEDS);
-
-
-
-void setup() {
-    FastLED.addLeds<WS2811, LED_PIN, COLOR_ORDER>(leds, NUM_LEDS)
-        .setCorrection(TypicalLEDStrip)
-        .setScreenMap(xyMap);
-    FastLED.setBrightness(brightness);
-    //noisePalette.setSpeed(speed);
-    noisePalette.setScale(scale);
-    fxEngine.addFx(animartrix);
-    fxEngine.addFx(noisePalette);
-}
-
-void loop() {
-    FastLED.setBrightness(!isOff ? brightness.as<uint8_t>() : 0);
-    noisePalette.setSpeed(speed);
-    noisePalette.setScale(scale);
-
-    if (changeFx) {
-        fxEngine.nextFx();
-    }
-    static int frame = 0;
-    EVERY_N_MILLISECONDS_DYNAMIC(changePalletTime.as<int>() * 1000) {
-        if (changePallete) {
-            noisePalette.changeToRandomPalette();
-        }
-    }
-
-    if (changePalette) {
-        noisePalette.changeToRandomPalette();
-
-    }
-    static int lastFxIndex = -1;
-    if (fxIndex.value() != lastFxIndex) {
-        lastFxIndex = fxIndex;
-        animartrix.fxSet(fxIndex);
-    }
-
-
-    fxEngine.draw(millis(), leds);
-    FastLED.show();
-    frame++;
-}
-
-
+/// @file    wasm.ino
+/// @brief   Demonstrates an advanced ino file with multiple effects and UI elements
+/// @author  Zach Vorhies
+///
+/// This sketch is fully compatible with the FastLED web compiler. To use it do the following:
+/// 1. Install Fastled: `pip install fastled`
+/// 2. cd into this examples page.
+/// 3. Run the FastLED web compiler at root: `fastled`
+/// 4. When the compiler is done a web page will open.
+
+
+#include <stdio.h>
+#include <string>
+
+#include <FastLED.h>
+#include "fx/2d/noisepalette.hpp"
+#include "fl/json.h"
+#include "fl/slice.h"
+#include "fx/fx_engine.h"
+
+#include "fx/2d/animartrix.hpp"
+#include "fl/ui.h"
+
+using namespace fl;
+
+
+#define LED_PIN 3
+#define BRIGHTNESS 96
+#define COLOR_ORDER GRB
+
+#define MATRIX_WIDTH 100
+#define MATRIX_HEIGHT 100
+#define GRID_SERPENTINE false
+
+#define NUM_LEDS (MATRIX_WIDTH * MATRIX_HEIGHT)
+
+// This example combines two features of FastLED to produce a remarkable range
+// of effects from a relatively small amount of code.  This example combines
+// FastLED's color palette lookup functions with FastLED's Perlin noise
+// generator, and the combination is extremely powerful.
+//
+// You might want to look at the "ColorPalette" and "Noise" examples separately
+// if this example code seems daunting.
+//
+//
+// The basic setup here is that for each frame, we generate a new array of
+// 'noise' data, and then map it onto the LED matrix through a color palette.
+//
+// Periodically, the color palette is changed, and new noise-generation
+// parameters are chosen at the same time.  In this example, specific
+// noise-generation values have been selected to match the given color palettes;
+// some are faster, or slower, or larger, or smaller than others, but there's no
+// reason these parameters can't be freely mixed-and-matched.
+//
+// In addition, this example includes some fast automatic 'data smoothing' at
+// lower noise speeds to help produce smoother animations in those cases.
+//
+// The FastLED built-in color palettes (Forest, Clouds, Lava, Ocean, Party) are
+// used, as well as some 'hand-defined' ones, and some proceedurally generated
+// palettes.
+
+// Scale determines how far apart the pixels in our noise matrix are.  Try
+// changing these values around to see how it affects the motion of the display.
+// The higher the value of scale, the more "zoomed out" the noise iwll be.  A
+// value of 1 will be so zoomed in, you'll mostly see solid colors.
+#define SCALE 20
+
+// We're using the x/y dimensions to map to the x/y pixels on the matrix.  We'll
+// use the z-axis for "time".  speed determines how fast time moves forward. Try
+// 1 for a very slow moving effect, or 60 for something that ends up looking
+// like water.
+#define SPEED 30
+
+CRGB leds[NUM_LEDS];
+XYMap xyMap = XYMap::constructRectangularGrid(MATRIX_WIDTH, MATRIX_HEIGHT);
+NoisePalette noisePalette = NoisePalette(xyMap);
+
+Title title("FastLED Wasm Demo");
+Description description("This example combines two features of FastLED to produce a remarkable range of effects from a relatively small amount of code.  This example combines FastLED's color palette lookup functions with FastLED's Perlin noise generator, and the combination is extremely powerful");
+
+Slider brightness("Brightness", 255, 0, 255);
+Checkbox isOff("Off", false);
+Slider speed("Noise - Speed", 15, 1, 50);
+Checkbox changePallete("Noise - Auto Palette", true);
+Slider changePalletTime("Noise - Time until next random Palette", 5, 1, 100);
+Slider scale( "Noise - Scale", 20, 1, 100);
+Button changePalette("Noise - Next Palette");
+Button changeFx("Switch between Noise & Animartrix");
+NumberField fxIndex("Animartrix - index", 0, 0, NUM_ANIMATIONS);
+Slider timeSpeed("Time Speed", 1, -10, 10, .1);
+
+Animartrix animartrix(xyMap, POLAR_WAVES);
+FxEngine fxEngine(NUM_LEDS);
+
+void setup() {
+    FastLED.addLeds<WS2811, LED_PIN, COLOR_ORDER>(leds, NUM_LEDS)
+        .setCorrection(TypicalLEDStrip)
+        .setScreenMap(xyMap);
+    FastLED.setBrightness(brightness);
+    //noisePalette.setSpeed(speed);
+    noisePalette.setScale(scale);
+    fxEngine.addFx(animartrix);
+    fxEngine.addFx(noisePalette);
+}
+
+void loop() {
+    FastLED.setBrightness(!isOff ? brightness.as<uint8_t>() : 0);
+    noisePalette.setSpeed(speed);
+    noisePalette.setScale(scale);
+    fxEngine.setSpeed(timeSpeed);
+
+    if (changeFx) {
+        fxEngine.nextFx();
+    }
+    static int frame = 0;
+    EVERY_N_MILLISECONDS_DYNAMIC(changePalletTime.as<int>() * 1000) {
+        if (changePallete) {
+            noisePalette.changeToRandomPalette();
+        }
+    }
+
+    if (changePalette) {
+        noisePalette.changeToRandomPalette();
+
+    }
+    static int lastFxIndex = -1;
+    if (fxIndex.value() != lastFxIndex) {
+        lastFxIndex = fxIndex;
+        animartrix.fxSet(fxIndex);
+    }
+
+
+    fxEngine.draw(millis(), leds);
+    FastLED.show();
+    frame++;
+}
+
+

{fastled-1.1.24 → fastled-1.1.26}/src/fastled/__init__.py

@@ -1,3 +1,3 @@
 """FastLED Wasm Compiler package."""
 
-__version__ = "1.1.24"
+__version__ = "1.1.26"

{fastled-1.1.24 → fastled-1.1.26}/src/fastled/app.py

@@ -157,7 +157,7 @@ def run_server(args: argparse.Namespace) -> int:
     compile_server = CompileServer(interactive=interactive, auto_updates=auto_update)
     if not interactive:
         print(f"Server started at {compile_server.url()}")
-    compile_server.wait_for_startup()
+        compile_server.wait_for_startup()
     try:
         while True:
             if not compile_server.proceess_running():
@@ -192,7 +192,8 @@ def main() -> int:
 if __name__ == "__main__":
     try:
         os.chdir("../fastled")
-        sys.argv.append("--upgrade")
+        sys.argv.append("--interactive")
+        sys.argv.append("examples/NoiseRing")
         sys.exit(main())
     except KeyboardInterrupt:
         print("\nExiting from main...")

{fastled-1.1.24 → fastled-1.1.26}/src/fastled/client_server.py

@@ -269,13 +269,19 @@ def run_client_server(args: argparse.Namespace) -> int:
                             timeout=1.0
                         )
                         file_changes = source_code_watcher.get_all_changes()
+                        sketch_files_changed = sketch_filewatcher.get_all_changes()
 
-                        if space_bar_pressed or file_changes:
+                        if file_changes:
+                            print(
+                                f"Changes detected in {file_changes}\nHit the space bar to trigger compile."
+                            )
+
+                        if space_bar_pressed or sketch_files_changed:
                             if space_bar_pressed:
                                 print("Space bar pressed, triggering recompile...")
-                            elif file_changes:
+                            elif sketch_files_changed:
                                 print(
-                                    f"Changes detected in {','.join(file_changes)}, triggering recompile..."
+                                    f"Changes detected in {','.join(sketch_files_changed)}, triggering recompile..."
                                 )
                             last_compiled_result = compile_function(
                                 last_hash_value=None