Skip to content

Commit f029ca7

Browse files
authored
Merge pull request #444 from adafruit/add-feather-s2-rev-tft
Add Support for Adafruit ESP32-S2 Reverse TFT Feather
2 parents 21a01e8 + 064de87 commit f029ca7

File tree

6 files changed

+16
-6
lines changed

6 files changed

+16
-6
lines changed

.github/workflows/build-clang-doxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
matrix:
2020
arduino-platform: ["funhouse", "magtag",
2121
"metroesp32s2", "feather_esp32s2",
22-
"feather_esp32s2_tft",
22+
"feather_esp32s2_tft", "feather_esp32s2_reverse_tft",
2323
"feather_esp32s3", "feather_esp32s3_4mbflash_2mbpsram",
2424
"feather_esp32s3_tft",
2525
"qtpy_esp32s3", "qtpy_esp32s2", "feather_esp32s3_reverse_tft"]
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+

src/Wippersnapper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
#endif
9797

9898
#define WS_VERSION \
99-
"1.0.0-beta.64" ///< WipperSnapper app. version (semver-formatted)
99+
"1.0.0-beta.65" ///< WipperSnapper app. version (semver-formatted)
100100

101101
// Reserved Adafruit IO MQTT topics
102102
#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
@@ -67,6 +67,13 @@
6767
#define STATUS_NEOPIXEL_NUM 1
6868
#define PIN_I2C_POWER_INVERTED 7
6969
#define USE_PSRAM ///< Board has PSRAM, use it for dynamic memory allocation
70+
#elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT)
71+
#define BOARD_ID "feather-esp32s2-reverse-tft"
72+
#define USE_TINYUSB
73+
#define USE_STATUS_NEOPIXEL
74+
#define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL
75+
#define STATUS_NEOPIXEL_NUM NEOPIXEL_NUM
76+
#define USE_PSRAM ///< Board has PSRAM, use it for dynamic memory allocation
7077
#elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM)
7178
#define BOARD_ID "feather-esp32s3"
7279
#define USE_TINYUSB

src/provisioning/tinyusb/Wippersnapper_FS.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3) || \
2424
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_TFT) || \
2525
defined(ARDUINO_RASPBERRY_PI_PICO_W) || \
26-
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT)
26+
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT) || \
27+
defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT)
2728
#include "Wippersnapper_FS.h"
2829
// On-board external flash (QSPI or SPI) macros should already
2930
// defined in your board variant if supported
@@ -495,15 +496,15 @@ void Wippersnapper_FS::createDisplayConfig() {
495496
delay(2500);
496497
}
497498

498-
void Wippersnapper_FS::parseDisplayConfig(displayConfig& displayFile) {
499+
void Wippersnapper_FS::parseDisplayConfig(displayConfig &displayFile) {
499500
StaticJsonDocument<384> doc;
500501
DeserializationError error;
501502

502503
if (!wipperFatFs.exists("/display_config.json")) {
503504
WS_DEBUG_PRINTLN("Could not find display_config.json, generating...");
504-
#ifdef ARDUINO_FUNHOUSE_ESP32S2
505+
#ifdef ARDUINO_FUNHOUSE_ESP32S2
505506
createDisplayConfig();
506-
#endif
507+
#endif
507508
}
508509

509510
File32 file = wipperFatFs.open("/display_config.json", FILE_READ);

0 commit comments

Comments
 (0)