diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index dcc1caab3..3de34772e 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -11,16 +11,17 @@ on: required: true jobs: - build-esp32s2: - name: Build WipperSnapper ESP32-S2, ESP32-S3 + build-esp32sx: + name: Build WipperSnapper ESP32-Sx runs-on: ubuntu-latest strategy: fail-fast: false matrix: arduino-platform: ["funhouse", "magtag", "metroesp32s2", "feather_esp32s2", - "qtpy_esp32s2", "feather_esp32s2_tft", - "feather_esp32s3", "qtpy_esp32s3"] + "feather_esp32s2_tft", + "feather_esp32s3", "feather_esp32s3_4mbflash_2mbpsram", + "qtpy_esp32s3", "qtpy_esp32s2"] steps: - uses: actions/setup-python@v1 with: @@ -40,8 +41,8 @@ jobs: - name: Install extra Arduino libraries run: | git clone --quiet https://github.com/brentru/Adafruit_MQTT_Library.git /home/runner/Arduino/libraries/Adafruit_MQTT_Library - - name: Build for ESP32-S2 - run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} + - name: Build for ESP32-Sx + run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --no_warn - name: list run : | ls @@ -243,7 +244,7 @@ jobs: clang_and_doxy: runs-on: ubuntu-latest - needs: [build-samd, build-esp32, build-esp32s2, build-esp8266, build-samd-non-fs] + needs: [build-samd, build-esp32, build-esp32sx, build-esp8266, build-samd-non-fs] steps: - uses: actions/setup-python@v1 with: diff --git a/examples/Wippersnapper_NoFS/.feather_esp32s3_4mbflash_2mbpsram.test.skip b/examples/Wippersnapper_NoFS/.feather_esp32s3_4mbflash_2mbpsram.test.skip new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_NoFS/.feather_esp32s3_4mbflash_2mbpsram.test.skip @@ -0,0 +1 @@ + diff --git a/examples/Wippersnapper_demo/.feather_esp32s3_4mbflash_2mbpsram.generate b/examples/Wippersnapper_demo/.feather_esp32s3_4mbflash_2mbpsram.generate new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/examples/Wippersnapper_demo/.feather_esp32s3_4mbflash_2mbpsram.generate @@ -0,0 +1 @@ + diff --git a/library.properties b/library.properties index addefa935..f00287f65 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Adafruit WipperSnapper Beta -version=1.0.0-beta.34 +version=1.0.0-beta.35 author=Adafruit maintainer=Adafruit sentence=Arduino client for Adafruit.io WipperSnapper diff --git a/src/Wippersnapper.h b/src/Wippersnapper.h index da734749d..29d946c88 100644 --- a/src/Wippersnapper.h +++ b/src/Wippersnapper.h @@ -60,7 +60,7 @@ #endif #define WS_VERSION \ - "1.0.0-beta.34" ///< WipperSnapper app. version (semver-formatted) + "1.0.0-beta.35" ///< WipperSnapper app. version (semver-formatted) // Reserved Adafruit IO MQTT topics #define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h index 74881e3b5..73c95564e 100644 --- a/src/Wippersnapper_Boards.h +++ b/src/Wippersnapper_Boards.h @@ -66,6 +66,12 @@ #define USE_STATUS_NEOPIXEL #define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL #define STATUS_NEOPIXEL_NUM NEOPIXEL_NUM +#elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3) +#define BOARD_ID "feather-esp32s3-4mbflash-2mbpsram" +#define USE_TINYUSB +#define USE_STATUS_NEOPIXEL +#define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL +#define STATUS_NEOPIXEL_NUM NEOPIXEL_NUM #elif defined(ARDUINO_ADAFRUIT_QTPY_ESP32S2) #define BOARD_ID "qtpy-esp32s2" #define USE_TINYUSB diff --git a/src/provisioning/tinyusb/Wippersnapper_FS.cpp b/src/provisioning/tinyusb/Wippersnapper_FS.cpp index 0dfdb8ccd..a80dc2e5e 100644 --- a/src/provisioning/tinyusb/Wippersnapper_FS.cpp +++ b/src/provisioning/tinyusb/Wippersnapper_FS.cpp @@ -19,7 +19,8 @@ defined(ARDUINO_ADAFRUIT_QTPY_ESP32S2) || \ defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT) || \ defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM) || \ - defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM) + defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM) || \ + defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3) #include "Wippersnapper_FS.h" // On-board external flash (QSPI or SPI) macros should already // defined in your board variant if supported