Merge pull request #444 from adafruit/add-feather-s2-rev-tft

Add Support for Adafruit ESP32-S2 Reverse TFT Feather
adafruit · Jul 6, 2023 · f029ca7 · f029ca7
2 parents 21a01e8 + 064de87
commit f029ca7
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         arduino-platform: ["funhouse", "magtag",
                            "metroesp32s2", "feather_esp32s2",
-                           "feather_esp32s2_tft",
+                           "feather_esp32s2_tft", "feather_esp32s2_reverse_tft",
                            "feather_esp32s3", "feather_esp32s3_4mbflash_2mbpsram",
                            "feather_esp32s3_tft",
                            "qtpy_esp32s3", "qtpy_esp32s2", "feather_esp32s3_reverse_tft"]

diff --git a/examples/Wippersnapper_NoFS/.feather_esp32s2_reverse_tft.test.skip b/examples/Wippersnapper_NoFS/.feather_esp32s2_reverse_tft.test.skip
@@ -0,0 +1 @@
+
diff --git a/examples/Wippersnapper_demo/.feather_esp32s2_reverse_tft.generate b/examples/Wippersnapper_demo/.feather_esp32s2_reverse_tft.generate
@@ -0,0 +1 @@
+
diff --git a/src/Wippersnapper.h b/src/Wippersnapper.h
@@ -96,7 +96,7 @@
 #endif
 
 #define WS_VERSION                                                             \
-  "1.0.0-beta.64" ///< WipperSnapper app. version (semver-formatted)
+  "1.0.0-beta.65" ///< 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
@@ -67,6 +67,13 @@
 #define STATUS_NEOPIXEL_NUM 1
 #define PIN_I2C_POWER_INVERTED 7
 #define USE_PSRAM ///< Board has PSRAM, use it for dynamic memory allocation
+#elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT)
+#define BOARD_ID "feather-esp32s2-reverse-tft"
+#define USE_TINYUSB
+#define USE_STATUS_NEOPIXEL
+#define STATUS_NEOPIXEL_PIN PIN_NEOPIXEL
+#define STATUS_NEOPIXEL_NUM NEOPIXEL_NUM
+#define USE_PSRAM ///< Board has PSRAM, use it for dynamic memory allocation
 #elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM)
 #define BOARD_ID "feather-esp32s3"
 #define USE_TINYUSB

diff --git a/src/provisioning/tinyusb/Wippersnapper_FS.cpp b/src/provisioning/tinyusb/Wippersnapper_FS.cpp
@@ -23,7 +23,8 @@
     defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3) ||                               \
     defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_TFT) ||                           \
     defined(ARDUINO_RASPBERRY_PI_PICO_W) ||                                    \
-    defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT)
+    defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT) ||                        \
+    defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT)
 #include "Wippersnapper_FS.h"
 // On-board external flash (QSPI or SPI) macros should already
 // defined in your board variant if supported
@@ -495,15 +496,15 @@ void Wippersnapper_FS::createDisplayConfig() {
   delay(2500);
 }
 
-void Wippersnapper_FS::parseDisplayConfig(displayConfig& displayFile) {
+void Wippersnapper_FS::parseDisplayConfig(displayConfig &displayFile) {
   StaticJsonDocument<384> doc;
   DeserializationError error;
 
   if (!wipperFatFs.exists("/display_config.json")) {
     WS_DEBUG_PRINTLN("Could not find display_config.json, generating...");
-    #ifdef ARDUINO_FUNHOUSE_ESP32S2
+#ifdef ARDUINO_FUNHOUSE_ESP32S2
     createDisplayConfig();
-    #endif
+#endif
   }
 
   File32 file = wipperFatFs.open("/display_config.json", FILE_READ);