From 72909a19789f94a31028d154999cfe81aafc7d2b Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 28 Apr 2022 15:51:33 -0400 Subject: [PATCH 1/5] add qtpy s3 --- src/Wippersnapper_Boards.h | 6 ++++++ src/provisioning/tinyusb/Wippersnapper_FS.cpp | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h index 11d1041f0..4795cea1a 100644 --- a/src/Wippersnapper_Boards.h +++ b/src/Wippersnapper_Boards.h @@ -72,6 +72,12 @@ #define USE_STATUS_NEOPIXEL #define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL #define STATUS_NEOPIXEL_NUM 1 +#elif defined(ADAFRUIT_QTPY_ESP32S3_NOPSRAM) +#define BOARD_ID "adafruit-qtpy-esp32s3" +#define USE_TINYUSB +#define USE_STATUS_NEOPIXEL +#define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL +#define STATUS_NEOPIXEL_NUM 1 #elif defined(ARDUINO_ESP8266_ADAFRUIT_HUZZAH) #define BOARD_ID "feather-esp8266" #define USE_LITTLEFS diff --git a/src/provisioning/tinyusb/Wippersnapper_FS.cpp b/src/provisioning/tinyusb/Wippersnapper_FS.cpp index a53605ba8..33db912fc 100644 --- a/src/provisioning/tinyusb/Wippersnapper_FS.cpp +++ b/src/provisioning/tinyusb/Wippersnapper_FS.cpp @@ -18,7 +18,8 @@ defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2) || \ defined(ARDUINO_ADAFRUIT_QTPY_ESP32S2) || \ defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT) || \ - defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM) + defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM) || \ + defined(ADAFRUIT_QTPY_ESP32S3_NOPSRAM) #include "Wippersnapper_FS.h" // On-board external flash (QSPI or SPI) macros should already // defined in your board variant if supported From 1ee57d899a828658ee3cf604d880703e61457044 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 28 Apr 2022 15:52:00 -0400 Subject: [PATCH 2/5] bump semver --- library.properties | 2 +- src/Wippersnapper.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library.properties b/library.properties index 37ac0e6db..4a29f20cc 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Adafruit WipperSnapper Beta -version=1.0.0-beta.31 +version=1.0.0-beta.33 author=Adafruit maintainer=Adafruit sentence=Arduino client for Adafruit.io WipperSnapper diff --git a/src/Wippersnapper.h b/src/Wippersnapper.h index fc1e2810f..03ef04263 100644 --- a/src/Wippersnapper.h +++ b/src/Wippersnapper.h @@ -62,7 +62,7 @@ #endif #define WS_VERSION \ - "1.0.0-beta.32" ///< WipperSnapper app. version (semver-formatted) + "1.0.0-beta.33" ///< WipperSnapper app. version (semver-formatted) // Reserved Adafruit IO MQTT topics #define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic From 23c5a62d42e5cf971b4ae4d21728be959ab3640d Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 28 Apr 2022 15:54:16 -0400 Subject: [PATCH 3/5] add to build matrix --- .github/workflows/build-clang-doxy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 4c78a076c..106de0761 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -20,7 +20,7 @@ jobs: arduino-platform: ["funhouse", "magtag", "metroesp32s2", "feather_esp32s2", "qtpy_esp32s2", "feather_esp32s2_tft", - "feather_esp32s3"] + "feather_esp32s3", "adafruit_qtpy_esp32s3"] steps: - uses: actions/setup-python@v1 with: From 746920ebbd2f4e8026184bfc62c71f6b863c1743 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 28 Apr 2022 16:03:40 -0400 Subject: [PATCH 4/5] add gen/skip files, fix detection constant --- examples/Wippersnapper_NoFS/.qtpy_esp32s3.test.skip | 1 + examples/Wippersnapper_demo/.qtpy_esp32s3.generate | 1 + src/Wippersnapper_Boards.h | 2 +- src/provisioning/tinyusb/Wippersnapper_FS.cpp | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 examples/Wippersnapper_NoFS/.qtpy_esp32s3.test.skip create mode 100644 examples/Wippersnapper_demo/.qtpy_esp32s3.generate diff --git a/examples/Wippersnapper_NoFS/.qtpy_esp32s3.test.skip b/examples/Wippersnapper_NoFS/.qtpy_esp32s3.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_NoFS/.qtpy_esp32s3.test.skip @@ -0,0 +1 @@ + diff --git a/examples/Wippersnapper_demo/.qtpy_esp32s3.generate b/examples/Wippersnapper_demo/.qtpy_esp32s3.generate new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_demo/.qtpy_esp32s3.generate @@ -0,0 +1 @@ + diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h index 4795cea1a..931ebbf5f 100644 --- a/src/Wippersnapper_Boards.h +++ b/src/Wippersnapper_Boards.h @@ -72,7 +72,7 @@ #define USE_STATUS_NEOPIXEL #define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL #define STATUS_NEOPIXEL_NUM 1 -#elif defined(ADAFRUIT_QTPY_ESP32S3_NOPSRAM) +#elif defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM) #define BOARD_ID "adafruit-qtpy-esp32s3" #define USE_TINYUSB #define USE_STATUS_NEOPIXEL diff --git a/src/provisioning/tinyusb/Wippersnapper_FS.cpp b/src/provisioning/tinyusb/Wippersnapper_FS.cpp index 33db912fc..eff8412ef 100644 --- a/src/provisioning/tinyusb/Wippersnapper_FS.cpp +++ b/src/provisioning/tinyusb/Wippersnapper_FS.cpp @@ -19,7 +19,7 @@ defined(ARDUINO_ADAFRUIT_QTPY_ESP32S2) || \ defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT) || \ defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM) || \ - defined(ADAFRUIT_QTPY_ESP32S3_NOPSRAM) + defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM) #include "Wippersnapper_FS.h" // On-board external flash (QSPI or SPI) macros should already // defined in your board variant if supported From 18d7e3544bc22a81f46deecf76c75413085526c2 Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 28 Apr 2022 16:14:48 -0400 Subject: [PATCH 5/5] fix name in build script --- .github/workflows/build-clang-doxy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 106de0761..e8031accc 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -20,7 +20,7 @@ jobs: arduino-platform: ["funhouse", "magtag", "metroesp32s2", "feather_esp32s2", "qtpy_esp32s2", "feather_esp32s2_tft", - "feather_esp32s3", "adafruit_qtpy_esp32s3"] + "feather_esp32s3", "qtpy_esp32s3"] steps: - uses: actions/setup-python@v1 with: