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

Add Adafruit ESP32-S2 TFT Feather Support
adafruit · Jan 10, 2022 · 038005d · 038005d
2 parents a6566e1 + 52ec163
commit 038005d
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,7 +36,7 @@ jobs:
       matrix:
         arduino-platform: ["funhouse_tinyusb", "magtag_tinyusb",
                            "metro_s2_tinyusb", "feather_s2_tinyusb",
-                           "qtpy_esp32_s2"]
+                           "qtpy_esp32_s2", "feather_s2_tft_tinyusb"]
     steps:
     - uses: actions/setup-python@v1
       with:

diff --git a/examples/Wippersnapper_NoFS/.feather_s2_tft_tinyusb.test.skip b/examples/Wippersnapper_NoFS/.feather_s2_tft_tinyusb.test.skip
@@ -0,0 +1 @@
+
diff --git a/examples/Wippersnapper_demo/.feather_s2_tft_tinyusb.generate b/examples/Wippersnapper_demo/.feather_s2_tft_tinyusb.generate
@@ -0,0 +1 @@
+
diff --git a/src/Wippersnapper_Boards.h b/src/Wippersnapper_Boards.h
@@ -60,6 +60,14 @@
 #define STATUS_NEOPIXEL_PIN 33
 #define STATUS_NEOPIXEL_NUM 1
 #define PIN_I2C_POWER_INVERTED 7
+#elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT)
+#define BOARD_ID "adafruit-feather-esp32s2-tft"
+#define USE_TINYUSB
+#define USE_STATUS_NEOPIXEL
+#define NEEDS_STATUS_NEOPIXEL_POWER
+#define STATUS_NEOPIXEL_PIN 33
+#define STATUS_NEOPIXEL_NUM 1
+#define PIN_I2C_POWER_INVERTED 7
 #elif defined(ARDUINO_ADAFRUIT_QTPY_ESP32S2)
 #define BOARD_ID "adafruit-qtpy-esp32s2"
 #define USE_TINYUSB

diff --git a/src/components/i2c/WipperSnapper_I2C.cpp b/src/components/i2c/WipperSnapper_I2C.cpp
@@ -35,10 +35,15 @@ WipperSnapper_Component_I2C::WipperSnapper_Component_I2C(
   WS_DEBUG_PRINT("\tFrequency (Hz): ");
   WS_DEBUG_PRINTLN(msgInitRequest->i2c_frequency);
 
-// Invert Feather ESP32-S2 pin power for I2C
-#ifdef ARDUINO_ADAFRUIT_FEATHER_ESP32S2
+#if defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2)
+  // Invert Feather ESP32-S2 pin power for I2C
   pinMode(PIN_I2C_POWER_INVERTED, OUTPUT);
   digitalWrite(PIN_I2C_POWER_INVERTED, LOW);
+#elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT)
+  // Power the AP2112 regulator
+  // TODO: Remove when fixed by latest BSP release
+  pinMode(TFT_I2C_POWER, OUTPUT);
+  digitalWrite(TFT_I2C_POWER, HIGH);
 #endif
 
   // Enable pullups on SCL, SDA

diff --git a/src/components/statusLED/Wippersnapper_StatusLED.cpp b/src/components/statusLED/Wippersnapper_StatusLED.cpp
@@ -51,7 +51,8 @@ bool Wippersnapper::statusLEDInit() {
 #ifdef NEEDS_STATUS_NEOPIXEL_POWER
   pinMode(NEOPIXEL_POWER, OUTPUT);
 #if defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2) ||                               \
-    defined(ARDUINO_ADAFRUIT_QTPY_ESP32S2)
+    defined(ARDUINO_ADAFRUIT_QTPY_ESP32S2) ||                                  \
+    defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT)
   digitalWrite(NEOPIXEL_POWER, HIGH);
 #else
   digitalWrite(NEOPIXEL_POWER, LOW);

diff --git a/src/network_interfaces/Wippersnapper_ESP32.h b/src/network_interfaces/Wippersnapper_ESP32.h
@@ -216,8 +216,8 @@ class Wippersnapper_ESP32 : public Wippersnapper {
       _disconnect();
       delay(100);
       WiFi.begin(_ssid, _pass);
-      delay(100);
       _status = WS_NET_DISCONNECTED;
+      delay(5000);
     }
   }
 

diff --git a/src/provisioning/tinyusb/Wippersnapper_FS.cpp b/src/provisioning/tinyusb/Wippersnapper_FS.cpp
@@ -12,7 +12,12 @@
  * BSD license, all text here must be included in any redistribution.
  *
  */
-#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)
+#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) ||                                  \
+    defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT)
 #include "Wippersnapper_FS.h"
 // On-board external flash (QSPI or SPI) macros should already
 // defined in your board variant if supported
@@ -277,7 +282,10 @@ void Wippersnapper_FS::createConfigFileSkel() {
   secretsFile.flush();
 // platform-dependent changes
 #if defined(ARDUINO_MAGTAG29_ESP32S2) || defined(ARDUINO_METRO_ESP32S2) ||     \
-    defined(ARDUINO_FUNHOUSE_ESP32S2) || defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2) || defined (ARDUINO_ADAFRUIT_QTPY_ESP32S2)
+    defined(ARDUINO_FUNHOUSE_ESP32S2) ||                                       \
+    defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2) ||                               \
+    defined(ARDUINO_ADAFRUIT_QTPY_ESP32S2) ||                                  \
+    defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT)
   secretsFile.print("HERE\",\n\t\"network_type_wifi_native\":{\n\t\t\"network_"
                     "ssid\":\"YOUR_WIFI_SSID_");
 #elif defined(ADAFRUIT_PYPORTAL) || defined(ADAFRUIT_METRO_M4_AIRLIFT_LITE)