From d8727d7075b7fa882f71461d8e855b5f326088f5 Mon Sep 17 00:00:00 2001 From: tyeth Date: Tue, 3 Jun 2025 21:00:26 +0100 Subject: [PATCH 1/4] Add Sparkle Motion Stick --- .github/workflows/build-clang-doxy.yml | 1 + platformio.ini | 16 ++++++++++++---- src/Wippersnapper_Boards.h | 6 ++++++ .../littlefs/WipperSnapper_LittleFS.cpp | 1 + 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 9461af29d..6dbf9934d 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -285,6 +285,7 @@ jobs: "wippersnapper_feather_esp32", "qtpy_esp32", "sparklemotionmini_esp32", + "sparklemotionstick_esp32", "feather_esp32_v2", "itsybitsy_esp32", "wippersnapper_qtpy_esp32c3", diff --git a/platformio.ini b/platformio.ini index 3e10e4fe2..d94a21af7 100644 --- a/platformio.ini +++ b/platformio.ini @@ -19,7 +19,7 @@ lib_deps = ;;;;;;;;;;; FunHouse / LVGL Boards uncomment these ;;;;;;;;;;;;;; ; https://github.com/adafruit/Adafruit_HX8357_Library.git ; https://github.com/adafruit/Adafruit_ILI9341.git - ; https://github.com/adafruit/Adafruit_STMPE610.git + ; https://github.com/adafruit/Adafruit_STMPE610.git ; https://github.com/adafruit/Adafruit-ST7735-Library.git ; https://github.com/adafruit/Adafruit_TouchScreen.git ; https://github.com/brentru/lvgl.git#wippersnapper @@ -291,7 +291,7 @@ extra_scripts = pre:rename_usb_config.py [env:adafruit_funhouse_esp32s2_debug] extends = common:esp32 board = adafruit_funhouse_esp32s2 -;lib_extra_dirs = +;lib_extra_dirs = build_type = debug build_flags = -DARDUINO_FUNHOUSE @@ -333,6 +333,14 @@ board_build.partitions = min_spiffs.csv board_build.filesystem = littlefs build_flags = -DARDUINO_SPARKLEMOTIONMINI_ESP32 +; Adafruit Sparkle Motion Stick +[env:adafruit_sparklemotionstick_esp32] +extends = common:esp32 +board = adafruit_sparklemotionstick_esp32 +board_build.partitions = min_spiffs.csv +board_build.filesystem = littlefs +build_flags = -DARDUINO_SPARKLEMOTIONSTICK_ESP32 + ; Adafruit QT Py ESP32-C3 [env:adafruit_qtpy_esp32c3] extends = common:esp32 @@ -506,7 +514,7 @@ extends = common:rp2040 [env:raspberypi_picow_debug_port_only] extends = common:rp2040 -build_flags = +build_flags = -DUSE_TINYUSB -DDEBUG_RP2040_PORT=Serial @@ -558,7 +566,7 @@ platform = https://github.com/maxgerhardt/platform-raspberrypi.git#develop platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git board = rpipico2w -build_flags = +build_flags = -DWIFICC=CYW43_COUNTRY_UK -DUSE_TINYUSB ; -DARDUINO_ARCH_RP2040 diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h index 940a4b774..756e185fd 100644 --- a/src/Wippersnapper_Boards.h +++ b/src/Wippersnapper_Boards.h @@ -183,6 +183,12 @@ #define USE_STATUS_NEOPIXEL #define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL #define STATUS_NEOPIXEL_NUM 1 +#elif defined(ARDUINO_SPARKLEMOTIONSTICK_ESP32) +#define BOARD_ID "sparklemotionstick-esp32" +#define USE_LITTLEFS +#define USE_STATUS_NEOPIXEL +#define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL +#define STATUS_NEOPIXEL_NUM 1 #elif defined(ARDUINO_RASPBERRY_PI_PICO_W) #define BOARD_ID "rpi-pico-w" #define USE_TINYUSB diff --git a/src/provisioning/littlefs/WipperSnapper_LittleFS.cpp b/src/provisioning/littlefs/WipperSnapper_LittleFS.cpp index b8f56d1d2..8d40de11d 100644 --- a/src/provisioning/littlefs/WipperSnapper_LittleFS.cpp +++ b/src/provisioning/littlefs/WipperSnapper_LittleFS.cpp @@ -18,6 +18,7 @@ defined(ARDUINO_ADAFRUIT_FEATHER_ESP32_V2) || \ defined(ARDUINO_ADAFRUIT_QTPY_ESP32_PICO) || \ defined(ARDUINO_SPARKLEMOTIONMINI_ESP32) || \ + defined(ARDUINO_SPARKLEMOTIONSTICK_ESP32) || \ defined(ARDUINO_ADAFRUIT_QTPY_ESP32C3) || \ defined(ARDUINO_ADAFRUIT_FEATHER_ESP32C6) #include "WipperSnapper_LittleFS.h" From f544a7c5ed3f9927be548887a0284f1bb970ddbf Mon Sep 17 00:00:00 2001 From: tyeth Date: Tue, 3 Jun 2025 21:00:41 +0100 Subject: [PATCH 2/4] Bump release version to beta.102 --- library.properties | 2 +- src/Wippersnapper.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library.properties b/library.properties index 7b31700e2..8b91b980b 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Adafruit WipperSnapper -version=1.0.0-beta.101 +version=1.0.0-beta.102 author=Adafruit maintainer=Adafruit sentence=Arduino application for Adafruit.io WipperSnapper diff --git a/src/Wippersnapper.h b/src/Wippersnapper.h index b5013d6df..5b3533c00 100644 --- a/src/Wippersnapper.h +++ b/src/Wippersnapper.h @@ -142,7 +142,7 @@ #endif #define WS_VERSION \ - "1.0.0-beta.101" ///< WipperSnapper app. version (semver-formatted) + "1.0.0-beta.102" ///< WipperSnapper app. version (semver-formatted) // Reserved Adafruit IO MQTT topics #define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic From d7008d9cb082fdf3e90b82f441543a66997dc637 Mon Sep 17 00:00:00 2001 From: tyeth Date: Tue, 3 Jun 2025 21:36:32 +0100 Subject: [PATCH 3/4] Add build asset .generate and .skip files --- examples/Wippersnapper_demo/.sparklemotionstick_esp32.generate | 1 + examples/wippersnapper_debug/.sparklemotionstick_esp32.test.skip | 1 + 2 files changed, 2 insertions(+) create mode 100644 examples/Wippersnapper_demo/.sparklemotionstick_esp32.generate create mode 100644 examples/wippersnapper_debug/.sparklemotionstick_esp32.test.skip diff --git a/examples/Wippersnapper_demo/.sparklemotionstick_esp32.generate b/examples/Wippersnapper_demo/.sparklemotionstick_esp32.generate new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_demo/.sparklemotionstick_esp32.generate @@ -0,0 +1 @@ + diff --git a/examples/wippersnapper_debug/.sparklemotionstick_esp32.test.skip b/examples/wippersnapper_debug/.sparklemotionstick_esp32.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/wippersnapper_debug/.sparklemotionstick_esp32.test.skip @@ -0,0 +1 @@ + From 7c674fa52a3c9d7014f9d89adfb11b9ef3486d55 Mon Sep 17 00:00:00 2001 From: tyeth Date: Thu, 5 Jun 2025 16:48:52 +0100 Subject: [PATCH 4/4] Set funhouse to use Adafruit SDfat fork 2.2.54 --- .github/workflows/build-clang-doxy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 6dbf9934d..e0d912256 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -45,6 +45,7 @@ jobs: run: bash ci/actions_install.sh - name: Install extra Arduino libraries run: | + git clone --quiet --branch 2.2.54 https://github.com/adafruit/SdFat.git /home/runner/Arduino/libraries/SdFat git clone --quiet https://github.com/milesburton/Arduino-Temperature-Control-Library.git /home/runner/Arduino/libraries/Arduino-Temperature-Control-Library git clone --quiet https://github.com/pstolarz/OneWireNg.git /home/runner/Arduino/libraries/OneWireNg git clone --quiet https://github.com/adafruit/Adafruit_HX8357_Library.git /home/runner/Arduino/libraries/Adafruit_HX8357_Library