Skip to content

Commit 81f0f9c

Browse files
authored
Merge pull request #197 from adafruit/add-qtpyesp32s2
Add Support for Adafruit QTPY ESP32-S2
2 parents 6ddd6b2 + a0b205d commit 81f0f9c

File tree

9 files changed

+25
-16
lines changed

9 files changed

+25
-16
lines changed

.github/workflows/release.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ jobs:
3535
fail-fast: false
3636
matrix:
3737
arduino-platform: ["funhouse_tinyusb", "magtag_tinyusb",
38-
"metro_s2_tinyusb", "feather_s2_tinyusb"]
38+
"metro_s2_tinyusb", "feather_s2_tinyusb",
39+
"qtpy_esp32_s2"]
3940
steps:
4041
- uses: actions/setup-python@v1
4142
with:
@@ -57,6 +58,10 @@ jobs:
5758
git clone --quiet https://github.com/brentru/Adafruit_MQTT_Library.git /home/runner/Arduino/libraries/Adafruit_MQTT_Library
5859
- name: Build for ESP32-S2
5960
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }}
61+
- name: list
62+
run : |
63+
ls
64+
ls examples/*/build/
6065
- name: Rename build artifacts to reflect the platform name
6166
run: |
6267
mv examples/*/build/*/Wippersnapper_demo.ino.uf2 wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=Adafruit WipperSnapper Beta
2-
version=1.0.0-beta.16
2+
version=1.0.0-beta.19
33
author=Adafruit
44
maintainer=Adafruit <[email protected]>
55
sentence=Arduino client for Adafruit.io WipperSnapper

src/Wippersnapper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
#endif
6464

6565
#define WS_VERSION \
66-
"1.0.0-beta.18" ///< WipperSnapper app. version (semver-formatted)
66+
"1.0.0-beta.19" ///< WipperSnapper app. version (semver-formatted)
6767

6868
// Reserved Adafruit IO MQTT topics
6969
#define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic

src/Wippersnapper_Boards.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,13 @@
6060
#define STATUS_NEOPIXEL_PIN 33
6161
#define STATUS_NEOPIXEL_NUM 1
6262
#define PIN_I2C_POWER_INVERTED 7
63+
#elif defined(ARDUINO_ADAFRUIT_QTPY_ESP32S2)
64+
#define BOARD_ID "adafruit-qtpy-esp32s2"
65+
#define USE_TINYUSB
66+
#define USE_STATUS_NEOPIXEL
67+
#define NEEDS_STATUS_NEOPIXEL_POWER
68+
#define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL
69+
#define STATUS_NEOPIXEL_NUM 1
6370
#elif defined(ARDUINO_ARCH_ESP8266)
6471
#define USB_VID 0xEA60
6572
#define USB_PID 0x10C4

src/components/i2c/WipperSnapper_I2C.cpp

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -170,16 +170,10 @@ WipperSnapper_Component_I2C::scanAddresses() {
170170
WS.feedWDT();
171171
#endif
172172

173-
if (scanResp.addresses_found_count == 0) {
174-
WS_DEBUG_PRINTLN("No I2C devices found");
175-
scanResp.bus_response =
176-
wippersnapper_i2c_v1_BusResponse_BUS_RESPONSE_ERROR_WIRING;
177-
} else {
178-
WS_DEBUG_PRINT("I2C Devices Found: ")
179-
WS_DEBUG_PRINTLN(scanResp.addresses_found_count);
180-
scanResp.bus_response =
181-
wippersnapper_i2c_v1_BusResponse_BUS_RESPONSE_SUCCESS;
182-
}
173+
WS_DEBUG_PRINT("I2C Devices Found: ")
174+
WS_DEBUG_PRINTLN(scanResp.addresses_found_count);
175+
176+
scanResp.bus_response = wippersnapper_i2c_v1_BusResponse_BUS_RESPONSE_SUCCESS;
183177

184178
return scanResp;
185179
}

src/components/statusLED/Wippersnapper_StatusLED.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ bool Wippersnapper::statusLEDInit() {
5050
// some hardware requires the NEOPIXEL_POWER pin to be enabled.
5151
#ifdef NEEDS_STATUS_NEOPIXEL_POWER
5252
pinMode(NEOPIXEL_POWER, OUTPUT);
53-
#if defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2)
53+
#if defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2) || \
54+
defined(ARDUINO_ADAFRUIT_QTPY_ESP32S2)
5455
digitalWrite(NEOPIXEL_POWER, HIGH);
5556
#else
5657
digitalWrite(NEOPIXEL_POWER, LOW);

src/provisioning/tinyusb/Wippersnapper_FS.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* BSD license, all text here must be included in any redistribution.
1313
*
1414
*/
15-
#if defined(ARDUINO_MAGTAG29_ESP32S2) || defined(ARDUINO_METRO_ESP32S2) || defined(ARDUINO_FUNHOUSE_ESP32S2) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE) || defined(ADAFRUIT_PYPORTAL) || defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2)
15+
#if defined(ARDUINO_MAGTAG29_ESP32S2) || defined(ARDUINO_METRO_ESP32S2) || defined(ARDUINO_FUNHOUSE_ESP32S2) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE) || defined(ADAFRUIT_PYPORTAL) || defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2) || defined(ARDUINO_ADAFRUIT_QTPY_ESP32S2)
1616
#include "Wippersnapper_FS.h"
1717
// On-board external flash (QSPI or SPI) macros should already
1818
// defined in your board variant if supported
@@ -277,7 +277,7 @@ void Wippersnapper_FS::createConfigFileSkel() {
277277
secretsFile.flush();
278278
// platform-dependent changes
279279
#if defined(ARDUINO_MAGTAG29_ESP32S2) || defined(ARDUINO_METRO_ESP32S2) || \
280-
defined(ARDUINO_FUNHOUSE_ESP32S2) || defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2)
280+
defined(ARDUINO_FUNHOUSE_ESP32S2) || defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2) || defined (ARDUINO_ADAFRUIT_QTPY_ESP32S2)
281281
secretsFile.print("HERE\",\n\t\"network_type_wifi_native\":{\n\t\t\"network_"
282282
"ssid\":\"YOUR_WIFI_SSID_");
283283
#elif defined(ADAFRUIT_PYPORTAL) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)

0 commit comments

Comments
 (0)