fastled 1.2.41__tar.gz → 1.2.42__tar.gz

{fastled-1.2.41 → fastled-1.2.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastled
-Version: 1.2.41
+Version: 1.2.42
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies

{fastled-1.2.41 → fastled-1.2.42}/compiler/init_runtime.py

@@ -9,9 +9,10 @@ HERE = Path(__file__).parent
 
 
 _COMPILER_DIR = Path("/js/compiler")
+_FASTLED_SRC_DIR = Path("/js/fastled/src")
+_WASM_DIR = _FASTLED_SRC_DIR / "platforms" / "wasm"
 
-
-def task(src: str | Path) -> None:
+def copy_task(src: str | Path) -> None:
     src = Path(src)
     if "entrypoint.sh" in str(src):
         return
@@ -49,9 +50,12 @@ def make_links() -> None:
     for pattern in patterns:
         files.extend(glob.glob(str(_COMPILER_DIR / pattern)))
 
+    for pattern in patterns:
+        files.extend(glob.glob(str(_WASM_DIR / pattern)))
+
     # Process files in parallel using ThreadPoolExecutor
     with ThreadPoolExecutor(max_workers=16) as executor:
-        executor.map(task, files)
+        executor.map(copy_task, files)
 
 
 def init_runtime() -> None:

fastled-1.2.42/src/fastled/__init__.py

@@ -0,0 +1,219 @@
+"""FastLED Wasm Compiler package."""
+
+from contextlib import contextmanager
+from multiprocessing import Process
+from pathlib import Path
+from typing import Generator
+
+from .compile_server import CompileServer
+from .live_client import LiveClient
+from .site.build import build
+from .types import BuildMode, CompileResult, CompileServerError
+
+# IMPORTANT! There's a bug in github which will REJECT any version update
+# that has any other change in the repo. Please bump the version as the
+# ONLY change in a commit, or else the pypi update and the release will fail.
+__version__ = "1.2.42"
+
+DOCKER_FILE = (
+    "https://raw.githubusercontent.com/zackees/fastled-wasm/refs/heads/main/Dockerfile"
+)
+
+
+class Api:
+    @staticmethod
+    def get_examples(host: str | CompileServer | None = None) -> list[str]:
+        from fastled.project_init import get_examples
+
+        if isinstance(host, CompileServer):
+            host = host.url()
+
+        return get_examples(host=host)
+
+    @staticmethod
+    def project_init(
+        example=None, outputdir=None, host: str | CompileServer | None = None
+    ) -> Path:
+        from fastled.project_init import project_init
+
+        if isinstance(host, CompileServer):
+            host = host.url()
+        return project_init(example, outputdir, host)
+
+    @staticmethod
+    def web_compile(
+        directory: Path | str,
+        host: str | CompileServer | None = None,
+        build_mode: BuildMode = BuildMode.QUICK,
+        profile: bool = False,  # When true then profile information will be enabled and included in the zip.
+    ) -> CompileResult:
+        from fastled.web_compile import web_compile
+
+        if isinstance(host, CompileServer):
+            host = host.url()
+        if isinstance(directory, str):
+            directory = Path(directory)
+        out: CompileResult = web_compile(
+            directory, host, build_mode=build_mode, profile=profile
+        )
+        return out
+
+    @staticmethod
+    def live_client(
+        sketch_directory: Path,
+        host: str | CompileServer | None = None,
+        auto_updates: bool = True,
+        auto_start=True,
+        open_web_browser=True,
+        keep_running=True,
+        build_mode=BuildMode.QUICK,
+        profile=False,
+    ) -> LiveClient:
+        return LiveClient(
+            sketch_directory=sketch_directory,
+            host=host,
+            auto_updates=auto_updates,
+            auto_start=auto_start,
+            open_web_browser=open_web_browser,
+            keep_running=keep_running,
+            build_mode=build_mode,
+            profile=profile,
+        )
+
+    @staticmethod
+    def spawn_server(
+        interactive=False,
+        auto_updates=None,
+        auto_start=True,
+        mapped_dir: Path | None = None,  # Sketch directory.
+        container_name: str | None = None,  # Specific docker container name.
+        remove_previous: bool = False,
+    ) -> CompileServer:
+        """Uses docker to spawn a compile server from the given name."""
+        from fastled.compile_server import CompileServer
+
+        out = CompileServer(
+            container_name=container_name,
+            interactive=interactive,
+            auto_updates=auto_updates,
+            mapped_dir=mapped_dir,
+            auto_start=auto_start,
+            remove_previous=remove_previous,
+        )
+        return out
+
+    @staticmethod
+    @contextmanager
+    def server(
+        interactive=False,
+        auto_updates=None,
+        auto_start=True,
+        mapped_dir: Path | None = None,  # Sketch directory.
+        container_name: str | None = None,  # Specific docker container name.
+        remove_previous=False,
+    ) -> Generator[CompileServer, None, None]:
+        server = Api.spawn_server(
+            interactive=interactive,
+            auto_updates=auto_updates,
+            auto_start=auto_start,
+            mapped_dir=mapped_dir,
+            container_name=container_name,
+            remove_previous=remove_previous,
+        )
+        try:
+            yield server
+        finally:
+            server.stop()
+
+
+class Docker:
+    @staticmethod
+    def is_installed() -> bool:
+        from fastled.docker_manager import DockerManager
+
+        return DockerManager.is_docker_installed()
+
+    @staticmethod
+    def is_running() -> bool:
+        from fastled.docker_manager import DockerManager
+
+        return DockerManager.is_running()
+
+    @staticmethod
+    def is_container_running(container_name: str | None = None) -> bool:
+        # from fastled.docker import is_container_running
+        from fastled.docker_manager import DockerManager
+        from fastled.settings import CONTAINER_NAME
+
+        docker_mgr = DockerManager()
+        container_name = container_name or CONTAINER_NAME
+        return docker_mgr.is_container_running(container_name)
+
+    @staticmethod
+    def purge() -> None:
+        from fastled.docker_manager import DockerManager
+        from fastled.settings import IMAGE_NAME
+
+        docker_mgr = DockerManager()
+        docker_mgr.purge(image_name=IMAGE_NAME)
+
+
+class Tools:
+    @staticmethod
+    def string_diff(needle: str, haystack: list[str]) -> list[tuple[float, str]]:
+        """Returns a sorted list with the top matches at the beginning."""
+        from fastled.string_diff import string_diff
+
+        return string_diff(needle, haystack)
+
+
+class Test:
+    __test__ = False  # This prevents unittest from recognizing it as a test class.
+
+    @staticmethod
+    def can_run_local_docker_tests() -> bool:
+        from fastled.test.can_run_local_docker_tests import can_run_local_docker_tests
+
+        return can_run_local_docker_tests()
+
+    @staticmethod
+    def test_examples(
+        examples: list[str] | None = None, host: str | CompileServer | None = None
+    ) -> dict[str, Exception]:
+        from fastled.test.examples import test_examples
+
+        if isinstance(host, CompileServer):
+            host = host.url()
+
+        return test_examples(examples=examples, host=host)
+
+    @staticmethod
+    def build_site(outputdir: Path, fast: bool | None = None, check: bool = True):
+        """Builds the FastLED compiler site."""
+        build(outputdir=outputdir, fast=fast, check=check)
+
+    @staticmethod
+    def spawn_http_server(
+        directory: Path | str = Path("."),
+        port: int | None = None,
+        open_browser: bool = True,
+    ) -> Process:
+        from fastled.open_browser import open_browser_process
+
+        if isinstance(directory, str):
+            directory = Path(directory)
+        proc: Process = open_browser_process(
+            directory, port=port, open_browser=open_browser
+        )
+        return proc
+
+
+__all__ = [
+    "Api",
+    "Test",
+    "Build",
+    "CompileServer",
+    "CompileResult",
+    "CompileServerError",
+    "BuildMode",
+]

{fastled-1.2.41 → fastled-1.2.42}/src/fastled/app.py

@@ -60,6 +60,11 @@ def main() -> int:
         return 0
 
     if build:
+        print("Building is disabled")
+        build = False
+
+    if build:
+        raise NotImplementedError("Building is not yet supported.")
         file_watcher_set(False)
         project_root = Path(".").absolute()
         print(f"Building Docker image at {project_root}")
@@ -110,6 +115,7 @@ def main() -> int:
 if __name__ == "__main__":
     # Note that the entry point for the exe is in cli.py
     try:
+        sys.argv.append("-i")
         sys.argv.append("-b")
         # sys.argv.append("examples/wasm")
         # sys.argv.append()

{fastled-1.2.41 → fastled-1.2.42}/src/fastled/parse_args.py

@@ -155,6 +155,10 @@ def parse_args() -> Args:
             os.chdir(fastled_dir)
         if args.directory is None:
             args.directory = str(Path("examples/wasm").absolute())
+        if args.interactive:
+            if not args.build:
+                print("Adding --build flag when using --interactive")
+                args.build = True
         return Args.from_namespace(args)
 
     if not args.update:

{fastled-1.2.41 → fastled-1.2.42}/src/fastled.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastled
-Version: 1.2.41
+Version: 1.2.42
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies

{fastled-1.2.41 → fastled-1.2.42}/src/fastled.egg-info/SOURCES.txt

@@ -31,8 +31,6 @@ upload_package.sh
 .vscode/settings.json
 .vscode/tasks.json
 compiler/.dockerignore
-compiler/Arduino.cpp
-compiler/Arduino.h
 compiler/CMakeLists.txt
 compiler/__init__.py
 compiler/arduino-pre-process.sh
@@ -101,8 +99,6 @@ src/fastled/test/examples.py
 tests/test_api.py
 tests/test_bad_ino.py
 tests/test_build_examples.py
-tests/test_build_from_docker.py
-tests/test_build_from_github.py
 tests/test_cli.py
 tests/test_compile_server.py
 tests/test_docker_linux_on_windows.py

fastled-1.2.41/compiler/Arduino.cpp

@@ -1,11 +0,0 @@
-
-#ifdef __EMSCRIPTEN__
-
-#include "./Arduino.h"
-
-SerialEmulation Serial;
-SerialEmulation Serial1;
-SerialEmulation Serial2;
-SerialEmulation Serial3;
-
-#endif

fastled-1.2.41/compiler/Arduino.h

@@ -1,162 +0,0 @@
-// Arduino.h emulation for the WebAssembly platform.
-// This allows us to compile sketches as is for the WebAssembly platform.
-
-#pragma once
-
-#include "fl/str.h"
-#include <algorithm>
-#include <random>
-#include <stdint.h>
-#include <stdio.h>
-#include <string>
-
-#include "fl/namespace.h"
-
-FASTLED_USING_NAMESPACE
-
-using std::max;
-using std::min;
-
-
-namespace fl {
-class Str;
-inline long map(long x, long in_min, long in_max, long out_min, long out_max) {
-    const long run = in_max - in_min;
-    if (run == 0) {
-        return 0; // AVR returns -1, SAM returns 0
-    }
-    const long rise = out_max - out_min;
-    const long delta = x - in_min;
-    return (delta * rise) / run + out_min;
-}
-
-// constrain
-template <typename T> T constrain(T x, T a, T b) {
-    return x < a ? a : (x > b ? b : x);
-}
-} // namespace fl
-
-
-using fl::map;
-using fl::constrain;
-
-
-inline long random(long min, long max) {
-    std::random_device rd;
-    std::mt19937 gen(rd());
-    // Arduino random is exclusive of the max value, but
-    // std::uniform_int_distribution is inclusive. So we subtract 1 from the max
-    // value.
-    std::uniform_int_distribution<> dis(min, max - 1);
-    return dis(gen);
-}
-
-
-inline int analogRead(int) { return random(0, 1023); }
-
-inline long random(long max) { return random(0, max); }
-
-template <typename T> struct PrintHelper {};
-
-#define DEFINE_PRINT_HELPER(type, format)                                      \
-    template <> struct PrintHelper<type> {                                     \
-        static void print(type val) { printf(format, val); }                   \
-        static void println(type val) {                                        \
-            printf(format, val);                                               \
-            printf("\n");                                                      \
-        }                                                                      \
-    }
-
-#define DEFINE_PRINT_HELPER_EXT(type, format, val_opp)                         \
-    template <> struct PrintHelper<type> {                                     \
-        static void print(type val) { printf(format, val_opp); }               \
-        static void println(type val) {                                        \
-            printf(format, val_opp);                                           \
-            printf("\n");                                                      \
-        }                                                                      \
-    }
-
-// gcc push options
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat"
-
-DEFINE_PRINT_HELPER(double, "%f");
-DEFINE_PRINT_HELPER(float, "%f");
-DEFINE_PRINT_HELPER(const char *, "%s");
-DEFINE_PRINT_HELPER(uint64_t, "%lu");
-DEFINE_PRINT_HELPER(uint32_t, "%u");
-DEFINE_PRINT_HELPER(uint16_t, "%u");
-DEFINE_PRINT_HELPER(uint8_t, "%u");
-DEFINE_PRINT_HELPER(int64_t, "%ld");
-DEFINE_PRINT_HELPER(int32_t, "%d");
-DEFINE_PRINT_HELPER(int16_t, "%d");
-DEFINE_PRINT_HELPER(int8_t, "%d");
-DEFINE_PRINT_HELPER(bool, "%d");
-DEFINE_PRINT_HELPER_EXT(std::string, "%s", val.c_str());
-DEFINE_PRINT_HELPER_EXT(fl::Str, "%s", val.c_str());
-
-#ifdef __EMSCRIPTEN__
-DEFINE_PRINT_HELPER(unsigned long, "%lu");  // Not sure why this is needed in emscripten
-#endif
-
-#define A0 0
-#define A1 1
-#define A2 2
-#define A3 3
-#define A4 4
-#define A5 5
-
-
-// gcc pop options
-#pragma GCC diagnostic pop
-
-struct SerialEmulation {
-    void begin(int) {}
-    template <typename T> void print(T val) { PrintHelper<T>::print(val); }
-    template <typename T> void println(T val) { PrintHelper<T>::println(val); }
-    void println() { printf("\n"); }
-    int available() { return 0; }
-    int read() { return 0; }
-    void write(uint8_t) {}
-    void write(const char *s) { printf("%s", s); }
-    void write(const uint8_t *s, size_t n) { fwrite(s, 1, n, stdout); }
-    void write(const char *s, size_t n) { fwrite(s, 1, n, stdout); }
-    void flush() {}
-    void end() {}
-    uint8_t peek() { return 0; }
-};
-
-#define LED_BUILTIN 13
-#define HIGH 1
-#define LOW 0
-#define INPUT 0
-#define OUTPUT 1
-#define INPUT_PULLUP 2
-
-
-inline void digitalWrite(int, int) {}
-inline void analogWrite(int, int) {}
-inline int digitalRead(int) { return LOW; }
-inline void pinMode(int, int) {}
-
-// avr flash memory macro is disabled.
-#ifdef F
-#undef F
-#endif
-
-#define F(x) x
-
-// Found in the wild for scintillating example
-#ifdef FL_PGM_READ_PTR_NEAR
-#undef FL_PGM_READ_PTR_NEAR
-#endif
-
-#define FL_PGM_READ_PTR_NEAR(addr) (*(addr))
-typedef unsigned char byte;
-
-extern SerialEmulation Serial;
-extern SerialEmulation Serial1;
-extern SerialEmulation Serial2;
-extern SerialEmulation Serial3;
-typedef SerialEmulation HardwareSerial;
-typedef SerialEmulation SoftwareSerial;