T-Watch S3 Support (#2632)

* T-Watch WIP

* Updates

* Temp

* Update screen spi bus and and backlight en

* Peripherals progress

* Fixes

* Fixes

* Updates

* DRV scaffolding

* Fixed touch-screen driver selection. WIP on DRV haptic feedback

* DRV2605 pmu channel

* Trunk

* Fixes and defaults

* Dropped an s

* Move PMU and turn off screen that way

* Add t-deck and t-watch-s3 to CI and cleanup

* More cleanup

src/graphics/Screen.cpp

@@ -944,6 +944,9 @@ void Screen::handleSetOn(bool on)
     if (on != screenOn) {
         if (on) {
             LOG_INFO("Turning on screen\n");
+#ifdef T_WATCH_S3
+            PMU->enablePowerOutput(XPOWERS_ALDO2);
+#endif
             dispdev.displayOn();
             dispdev.displayOn();
             enabled = true;
@@ -952,6 +955,9 @@ void Screen::handleSetOn(bool on)
         } else {
             LOG_INFO("Turning off screen\n");
             dispdev.displayOff();
+#ifdef T_WATCH_S3
+            PMU->disablePowerOutput(XPOWERS_ALDO2);
+#endif
             enabled = false;
         }
         screenOn = on;

src/graphics/Screen.h

@@ -313,6 +313,13 @@ class Screen : public concurrency::OSThread
 
     void setWelcomeFrames();
 
+    void getTouch(int *x, int *y)
+    {
+#if defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ST7789_CS)
+        dispdev.getTouch(x, y);
+#endif
+    };
+
   protected:
     /// Updates the UI.
     //
@@ -394,4 +401,4 @@ class Screen : public concurrency::OSThread
 };
 
 } // namespace graphics
-#endif
+#endif

src/graphics/TFTDisplay.cpp

@@ -108,7 +108,11 @@ class LGFX : public lgfx::LGFX_Device
     lgfx::Panel_ST7789 _panel_instance;
     lgfx::Bus_SPI _bus_instance;
     lgfx::Light_PWM _light_instance;
+#ifdef T_WATCH_S3
+    lgfx::Touch_FT5x06 _touch_instance;
+#else
     lgfx::Touch_GT911 _touch_instance;
+#endif
 
   public:
     LGFX(void)
@@ -194,8 +198,13 @@ class LGFX : public lgfx::LGFX_Device
             // I2C
             cfg.i2c_port = 1;
             cfg.i2c_addr = TOUCH_SLAVE_ADDRESS;
+#ifdef SCREEN_TOUCH_USE_I2C1
+            cfg.pin_sda = I2C_SDA1;
+            cfg.pin_scl = I2C_SCL1;
+#else
             cfg.pin_sda = I2C_SDA;
             cfg.pin_scl = I2C_SCL;
+#endif
             cfg.freq = 400000;
 
             _touch_instance.config(cfg);
@@ -261,7 +270,7 @@ void TFTDisplay::sendCommand(uint8_t com)
     // handle display on/off directly
     switch (com) {
     case DISPLAYON: {
-#ifdef TFT_BL
+#if defined(TFT_BL) && defined(TFT_BACKLIGHT_ON)
         digitalWrite(TFT_BL, TFT_BACKLIGHT_ON);
 #endif
 #ifdef VTFT_CTRL
@@ -270,7 +279,7 @@ void TFTDisplay::sendCommand(uint8_t com)
         break;
     }
     case DISPLAYOFF: {
-#ifdef TFT_BL
+#if defined(TFT_BL) && defined(TFT_BACKLIGHT_ON)
         digitalWrite(TFT_BL, !TFT_BACKLIGHT_ON);
 #endif
 #ifdef VTFT_CTRL
@@ -304,6 +313,8 @@ bool TFTDisplay::connect()
     tft.init();
 #if defined(M5STACK) || defined(T_DECK)
     tft.setRotation(1); // M5Stack/T-Deck have the TFT in landscape
+#elif defined(T_WATCH_S3)
+    tft.setRotation(0); // T-Watch S3 has the TFT in portrait
 #else
     tft.setRotation(3); // Orient horizontal and wide underneath the silkscreen name label
 #endif
@@ -311,4 +322,12 @@ bool TFTDisplay::connect()
     return true;
 }
 
+// Get touch coords from the display
+void TFTDisplay::getTouch(int *x, int *y)
+{
+#ifndef M5STACK
+    tft.getTouch(x, y);
 #endif
+}
+
+#endif

src/graphics/TFTDisplay.h

@@ -28,6 +28,8 @@ class TFTDisplay : public OLEDDisplay
      */
     void setDetected(uint8_t detected);
 
+    void getTouch(int *x, int *y);
+
   protected:
     // the header size of the buffer used, e.g. for the SPI command header
     virtual int getBufferOffset(void) override { return 0; }
@@ -37,4 +39,4 @@ class TFTDisplay : public OLEDDisplay
 
     // Connect to the display
     virtual bool connect() override;
-};
+};