fastled 1.0.15__tar.gz → 1.1.0__tar.gz

{fastled-1.0.15 → fastled-1.1.0}/.github/workflows/build_multi_docker_image.yml

@@ -100,8 +100,3 @@ jobs:
       - 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.0.15 → fastled-1.1.0}/.gitignore

@@ -14,7 +14,6 @@ __pycache__/
 .Python
 prod_env/
 data/
-!tests/test_ino/embedded/data
 build/
 develop-eggs/
 dist/

fastled-1.1.0/PKG-INFO

@@ -0,0 +1,113 @@
+Metadata-Version: 2.1
+Name: fastled
+Version: 1.1.0
+Summary: FastLED Wasm Compiler
+Home-page: https://github.com/zackees/fastled-wasm
+Maintainer: Zachary Vorhies
+License: BSD 3-Clause License
+Keywords: template-python-cmd
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.7
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: docker
+Requires-Dist: httpx
+Requires-Dist: watchdog
+Requires-Dist: livereload
+Requires-Dist: download
+Requires-Dist: filelock
+
+# FastLED wasm compiler
+
+Compiles an Arduino/Platformio sketch into a wasm binary that can be run directly in the web browser.
+
+[![Linting](https://github.com/zackees/fastled-wasm/actions/workflows/lint.yml/badge.svg)](https://github.com/zackees/fastled-wasm/actions/workflows/lint.yml)
+[![Build and Push Multi Docker Image](https://github.com/zackees/fastled-wasm/actions/workflows/build_multi_docker_image.yml/badge.svg)](https://github.com/zackees/fastled-wasm/actions/workflows/build_multi_docker_image.yml)
+[![MacOS_Tests](https://github.com/zackees/fastled-wasm/actions/workflows/test_macos.yml/badge.svg)](https://github.com/zackees/fastled-wasm/actions/workflows/test_macos.yml)
+[![Ubuntu_Tests](https://github.com/zackees/fastled-wasm/actions/workflows/test_ubuntu.yml/badge.svg)](https://github.com/zackees/fastled-wasm/actions/workflows/test_ubuntu.yml)
+[![Win_Tests](https://github.com/zackees/fastled-wasm/actions/workflows/test_win.yml/badge.svg)](https://github.com/zackees/fastled-wasm/actions/workflows/test_win.yml)
+
+
+
+# About
+
+This python app will compile your FastLED style sketches into html/js/wasm output that runs directly in the browser.
+
+Compile times are extremely fast - I've seen as low as 5 seconds but 8-15 seconds is typical.
+
+This works on Windows/Linux/Mac(arm/x64).
+
+Docker is required.
+
+https://github.com/user-attachments/assets/64ae0e6c-5f8b-4830-ab87-dcc25bc61218
+
+# Demo
+
+https://zackees.github.io/fastled-wasm/
+
+
+
+# Install
+
+```bash
+pip install fastled-wasm
+```
+
+**Note that you may need to install x86 docker emulation on Mac-m1 and later, as this is an x86 only image at the prsent.**
+
+# Use
+
+Change to the directory where the sketch lives and run
+
+```bash
+cd <SKETCH-DIRECTORY>
+fastled-wasm
+```
+
+Or if you don't have docker then use our web compiler
+
+```bash
+cd <SKETCH-DIRECTORY>
+fastled-wasm --web
+```
+
+After compilation a web browser windows will pop up.
+
+# Hot reload by default
+
+Once launched, the compiler will remain open, listening to changes and recompiling as necessary and hot-reloading the sketch into the current browser.
+
+This style of development should be familiar to those doing web development.
+
+# Data
+
+If you want to embed data, then do so in the `data/` directory at the project root. The files will appear in the `data/` director of any spawned FileSystem or SDCard.
+
+
+### About the compilation.
+
+Pre-processing is done to your source files. A fake Arduino.h will be inserted into your source files that will
+provide shims for most of the common api points.
+
+
+# Revisions
+
+  * 1.1.0 - Use `fastled` as the command for the wasm compiler.
+  * 1.0.17 - Pulls updates when necessary. Removed dependency on keyring.
+  * 1.0.16 - `fastled-wasm` package name has been changed to `fled`
+  * 1.0.15 - `fled` is an alias of `fastled-wasm` and will eventually replace it. `--web-host` was folded into `--web`, which if unspecified will attempt to run a local docker server and fallback to the cloud server if that fails. Specifying `--web` with no arguments will default to the cloud server while an argument (like `localhost`) will cause it to bind to that already running server for compilation.
+  * 1.0.14 - For non significant changes (comments, whitespace) in C++/ino/*.h files, compilation is skipped. This significantly reduces load on the server and prevents unnecessary local client browser refreshes.
+  * 1.0.13 - Increase speed of local compiles by running the server version of the compiler so it can keep it's cache and not have to pay docker startup costs because now it's a persistant server until exit.
+  * 1.0.12 - Added suppport for compile modes. Pass in `--release`, `--quick`, `--debug` for different compile options. We also support `--profile` to profile the build process.
+  * 1.0.11 - `--web` compile will automatically be enabled if the local build using docker fails.
+  * 1.0.10 - Watching files is now available for `--web`
+  * 1.0.9 - Enabled web compile. Access it with `--web` or `--web-host`
+  * 1.0.8 - Allow more than one fastled-wasm browser instances to co-exist by searching for unused ports after 8081.
+  * 1.0.7 - Docker multi image build implemented, tool now points to new docker image compile.
+  * 1.0.6 - Removed `--no-open` and `--watch`, `--watch` is now assumed unless `--just-compile` is used.
+  * 1.0.5 - Implemented `--update` to update the compiler image from the docker registry.
+  * 1.0.4 - Implemented `--watch` which will watch for changes and then re-launch the compilation step.
+  * 1.0.3 - Integrated `live-server` to launch when available.
+  * 1.0.2 - Small bug with new installs.
+  * 1.0.1 - Re-use is no longer the default, due to problems.
+  * 1.0.0 - Initial release.

fastled-1.1.0/README.md

@@ -0,0 +1,94 @@
+# FastLED wasm compiler
+
+Compiles an Arduino/Platformio sketch into a wasm binary that can be run directly in the web browser.
+
+[![Linting](https://github.com/zackees/fastled-wasm/actions/workflows/lint.yml/badge.svg)](https://github.com/zackees/fastled-wasm/actions/workflows/lint.yml)
+[![Build and Push Multi Docker Image](https://github.com/zackees/fastled-wasm/actions/workflows/build_multi_docker_image.yml/badge.svg)](https://github.com/zackees/fastled-wasm/actions/workflows/build_multi_docker_image.yml)
+[![MacOS_Tests](https://github.com/zackees/fastled-wasm/actions/workflows/test_macos.yml/badge.svg)](https://github.com/zackees/fastled-wasm/actions/workflows/test_macos.yml)
+[![Ubuntu_Tests](https://github.com/zackees/fastled-wasm/actions/workflows/test_ubuntu.yml/badge.svg)](https://github.com/zackees/fastled-wasm/actions/workflows/test_ubuntu.yml)
+[![Win_Tests](https://github.com/zackees/fastled-wasm/actions/workflows/test_win.yml/badge.svg)](https://github.com/zackees/fastled-wasm/actions/workflows/test_win.yml)
+
+
+
+# About
+
+This python app will compile your FastLED style sketches into html/js/wasm output that runs directly in the browser.
+
+Compile times are extremely fast - I've seen as low as 5 seconds but 8-15 seconds is typical.
+
+This works on Windows/Linux/Mac(arm/x64).
+
+Docker is required.
+
+https://github.com/user-attachments/assets/64ae0e6c-5f8b-4830-ab87-dcc25bc61218
+
+# Demo
+
+https://zackees.github.io/fastled-wasm/
+
+
+
+# Install
+
+```bash
+pip install fastled-wasm
+```
+
+**Note that you may need to install x86 docker emulation on Mac-m1 and later, as this is an x86 only image at the prsent.**
+
+# Use
+
+Change to the directory where the sketch lives and run
+
+```bash
+cd <SKETCH-DIRECTORY>
+fastled-wasm
+```
+
+Or if you don't have docker then use our web compiler
+
+```bash
+cd <SKETCH-DIRECTORY>
+fastled-wasm --web
+```
+
+After compilation a web browser windows will pop up.
+
+# Hot reload by default
+
+Once launched, the compiler will remain open, listening to changes and recompiling as necessary and hot-reloading the sketch into the current browser.
+
+This style of development should be familiar to those doing web development.
+
+# Data
+
+If you want to embed data, then do so in the `data/` directory at the project root. The files will appear in the `data/` director of any spawned FileSystem or SDCard.
+
+
+### About the compilation.
+
+Pre-processing is done to your source files. A fake Arduino.h will be inserted into your source files that will
+provide shims for most of the common api points.
+
+
+# Revisions
+
+  * 1.1.0 - Use `fastled` as the command for the wasm compiler.
+  * 1.0.17 - Pulls updates when necessary. Removed dependency on keyring.
+  * 1.0.16 - `fastled-wasm` package name has been changed to `fled`
+  * 1.0.15 - `fled` is an alias of `fastled-wasm` and will eventually replace it. `--web-host` was folded into `--web`, which if unspecified will attempt to run a local docker server and fallback to the cloud server if that fails. Specifying `--web` with no arguments will default to the cloud server while an argument (like `localhost`) will cause it to bind to that already running server for compilation.
+  * 1.0.14 - For non significant changes (comments, whitespace) in C++/ino/*.h files, compilation is skipped. This significantly reduces load on the server and prevents unnecessary local client browser refreshes.
+  * 1.0.13 - Increase speed of local compiles by running the server version of the compiler so it can keep it's cache and not have to pay docker startup costs because now it's a persistant server until exit.
+  * 1.0.12 - Added suppport for compile modes. Pass in `--release`, `--quick`, `--debug` for different compile options. We also support `--profile` to profile the build process.
+  * 1.0.11 - `--web` compile will automatically be enabled if the local build using docker fails.
+  * 1.0.10 - Watching files is now available for `--web`
+  * 1.0.9 - Enabled web compile. Access it with `--web` or `--web-host`
+  * 1.0.8 - Allow more than one fastled-wasm browser instances to co-exist by searching for unused ports after 8081.
+  * 1.0.7 - Docker multi image build implemented, tool now points to new docker image compile.
+  * 1.0.6 - Removed `--no-open` and `--watch`, `--watch` is now assumed unless `--just-compile` is used.
+  * 1.0.5 - Implemented `--update` to update the compiler image from the docker registry.
+  * 1.0.4 - Implemented `--watch` which will watch for changes and then re-launch the compilation step.
+  * 1.0.3 - Integrated `live-server` to launch when available.
+  * 1.0.2 - Small bug with new installs.
+  * 1.0.1 - Re-use is no longer the default, due to problems.
+  * 1.0.0 - Initial release.

{fastled-1.0.15 → fastled-1.1.0}/examples/SdCard/SdCard.ino

@@ -21,12 +21,8 @@ void loop() {
 #include "fx/video.h"
 #include "file_system.h"
 #include "ui.h"
-#include "screenmap.h"
-#include "file_system.h"
-
-
-#include "screenmap.json.h"  // const char JSON_SCREEN_MAP[] = { ... }
 
+#include "file_system.h"
 
 #define LED_PIN 2
 #define LED_TYPE WS2811
@@ -42,13 +38,8 @@ void loop() {
 #define NUM_LEDS (MATRIX_WIDTH * MATRIX_HEIGHT)
 #define IS_SERPINTINE true
 
-
-Title title("SDCard Demo - Mapped Video");
-Description description("Video data is streamed off of a SD card and displayed on a LED strip. The video data is mapped to the LED strip using a ScreenMap.");
-
-
 CRGB leds[NUM_LEDS];
-ScreenMap screenMap;
+XYMap xyMap(MATRIX_WIDTH, MATRIX_HEIGHT, IS_SERPINTINE);  // No serpentine
 
 FileSystem filesystem;
 Video video;
@@ -60,14 +51,9 @@ void setup() {
     if (!filesystem.beginSd(CHIP_SELECT_PIN)) {
         Serial.println("Failed to initialize file system.");
     }
-    // JSON_SCREEN_MAP
-    FixedMap<Str, ScreenMap, 16> screenMaps;
-    ScreenMap::ParseJson(JSON_SCREEN_MAP, &screenMaps);
-    ScreenMap screenMap = screenMaps["strip1"];
-
     FastLED.addLeds<LED_TYPE, LED_PIN, COLOR_ORDER>(leds, NUM_LEDS)
         .setCorrection(TypicalLEDStrip)
-        .setScreenMap(screenMap);
+        .setScreenMap(xyMap);
     FastLED.setBrightness(96);
     //fxEngine.addFx(animartrix);
     video = filesystem.openVideo("data/video.dat", NUM_LEDS, FPS);
@@ -78,7 +64,28 @@ void setup() {
 
 void loop() {
     uint32_t now = millis();
+
+    // fxEngine.draw(millis(), leds);
     video.draw(now, leds);
+
+    EVERY_N_SECONDS(1){
+        Serial.println("Drawing");
+        for (int i = 0; i < NUM_LEDS;) {
+            int nleft = MIN(8, NUM_LEDS - i);
+            for (int j = 0; j < nleft; j++) {
+                CRGB c = leds[i + j];
+                Serial.print("(");
+                Serial.print(c.r);
+                Serial.print(", ");
+                Serial.print(c.g);
+                Serial.print(", ");
+                Serial.print(c.b);
+                Serial.print(")  ");
+            }
+            Serial.println();
+            i += nleft;
+        }
+    }
     FastLED.show();
 }
 

{fastled-1.0.15 → fastled-1.1.0}/examples/wasm/wasm.ino

@@ -14,8 +14,9 @@
 #include "fx/fx_engine.h"
 
 #include "fx/2d/animartrix.hpp"
-#include "ui.h"
+#include "platforms/wasm/js.h"
 
+#include "ui.h"
 
 #define LED_PIN 3
 #define BRIGHTNESS 96
@@ -68,9 +69,6 @@ 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);
@@ -79,13 +77,12 @@ 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);
+NumberField fxIndex("Animartrix - index", 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)
@@ -122,6 +119,11 @@ void loop() {
         animartrix.fxSet(fxIndex);
     }
 
+    EVERY_N_MILLISECONDS(1000) {
+        printf("fastled running\r\n");
+        printf("Numberfield: %f\r\n", fxIndex.value());
+    }
+
 
     fxEngine.draw(millis(), leds);
     FastLED.show();

{fastled-1.0.15 → fastled-1.1.0}/pyproject.toml

@@ -1,58 +1,54 @@
-[build-system]
-requires = ["setuptools>=65.5.1", "setuptools-scm", "wheel"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "fastled"
-readme = "README.md"
-description = "FastLED Wasm Compiler"
-requires-python = ">=3.7"
-keywords = ["template-python-cmd"]
-license = { text = "BSD 3-Clause License" }
-classifiers = ["Programming Language :: Python :: 3"]
-dependencies = [
-    "docker",
-    "httpx",
-    "watchdog",
-    "livereload",
-    "download",
-    "filelock",
-]
-
-dynamic = ["version"]
-
-
-[tool.setuptools]
-package-dir = {"" = "src"}
-
-[tool.setuptools.dynamic]
-version = { attr = "fastled.__version__" }
-
-[tool.ruff]
-line-length = 200
-
-[tool.pylint."MESSAGES CONTROL"]
-good-names = [
-    "c",
-    "i",
-    "ok",
-    "id",
-    "e",
-    "f"
-]
-disable = [
-    "missing-function-docstring",
-    "missing-module-docstring"
-]
-
-[tool.isort]
-profile = "black"
-
-[tool.mypy]
-ignore_missing_imports = true
-disable_error_code = ["import-untyped"]
-
-[project.scripts]
-fastled-wasm = "fastled.cli:main"
-fled = "fastled.cli:main"
-fastled = "fastled.cli:main"
+[build-system]
+requires = ["setuptools>=65.5.1", "setuptools-scm", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "fastled"
+readme = "README.md"
+description = "FastLED Wasm Compiler"
+requires-python = ">=3.7"
+keywords = ["template-python-cmd"]
+license = { text = "BSD 3-Clause License" }
+classifiers = ["Programming Language :: Python :: 3"]
+dependencies = [
+    "docker",
+    "httpx",
+    "watchdog",
+    "livereload",
+    "download",
+    "filelock",
+]
+# Change this with the version number bump.
+version = "1.1.0"
+
+[tool.setuptools]
+package-dir = {"" = "src"}
+
+[tool.ruff]
+line-length = 200
+
+[tool.pylint."MESSAGES CONTROL"]
+good-names = [
+    "c",
+    "i",
+    "ok",
+    "id",
+    "e",
+    "f"
+]
+disable = [
+    "missing-function-docstring",
+    "missing-module-docstring"
+]
+
+[tool.isort]
+profile = "black"
+
+[tool.mypy]
+ignore_missing_imports = true
+disable_error_code = ["import-untyped"]
+
+[project.scripts]
+fastled-wasm = "fastled.cli:main"
+fled = "fastled.cli:main"
+fastled = "fastled.cli:main"

{fastled-1.0.15 → fastled-1.1.0}/setup.py

@@ -4,7 +4,6 @@ Setup file.
 
 import os
 import re
-from pathlib import Path
 
 from setuptools import setup