MagTag on Staging

Author: brentru

src/Wippersnapper.cpp

@@ -2915,7 +2915,7 @@ ws_status_t Wippersnapper::run() {
   WS.feedWDT();
 
   // Process display controller events, if initialized
-  WS._displayController->update(getRSSI(), networkStatus() == WS_CONNECTED);
+  //WS._displayController->update(getRSSI(), networkStatus() == WS_CONNECTED);
   WS.feedWDT();
 
   return WS_NET_CONNECTED; // TODO: Make this funcn void!

src/components/display/controller.cpp

@@ -69,8 +69,8 @@ bool DisplayController::Handle_Display_AddOrReplace(
     return false;
   }
 
-  WS.feedWDT();
-  display->showSplash();
+  //WS.feedWDT();
+  //display->showSplash();
   WS.feedWDT();
   display->drawStatusBar(WS._config.aio_user);
   WS.feedWDT();

src/components/display/drivers/dispDrvSt7789.h

@@ -44,11 +44,15 @@ class dispDrvSt7789 : public dispDrvBase {
                 int16_t rst = -1, int16_t miso = -1)
       : dispDrvBase(cs, dc, mosi, sck, rst, miso), _display(nullptr) {}
 
+  /*!
+      @brief  Destructor for the ST7789 display driver.
+  */
   ~dispDrvSt7789() {
     if (_display) {
       delete _display;
       _display = nullptr;
     }
+    //digitalWrite(TFT_BACKLIGHT, LOW);
   }
 
   /*!
@@ -57,30 +61,21 @@ class dispDrvSt7789 : public dispDrvBase {
   */
   bool begin() override {
 
-// Special power control configuration for
-// boards with built-in TFTs
-#if defined(TFT_BACKLITE)
-    // turn on backlite
-    pinMode(TFT_BACKLITE, OUTPUT);
-    digitalWrite(TFT_BACKLITE, HIGH);
-
-#if defined(TFT_I2C_POWER)
-    // turn on the TFT / I2C power supply
-    pinMode(TFT_I2C_POWER, OUTPUT);
-    digitalWrite(TFT_I2C_POWER, HIGH);
-    delay(10);
-#endif // TFT_I2C_POWER
-#endif
-
     _display = new Adafruit_ST7789(_pin_cs, _pin_dc, _pin_rst);
     if (!_display)
       return false;
 
     _display->init(_width, _height);
     _display->setRotation(_rotation);
     setTextSize(ST7789_TEXT_SZ_DEFAULT);
-    _display->fillScreen(ST77XX_BLACK);
+    _display->fillScreen(ST77XX_WHITE);
     _display->setTextColor(ST77XX_WHITE);
+
+/*     #ifdef TFT_BACKLIGHT
+    pinMode(TFT_BACKLIGHT, OUTPUT);
+    digitalWrite(TFT_BACKLIGHT, HIGH); // Backlight on
+    #endif */
+
     return true;
   }
 
@@ -115,7 +110,7 @@ class dispDrvSt7789 : public dispDrvBase {
       return;
     }
 
-    delay(1000);
+    delay(1500); // Pause for 1.5 seconds
   }
 
   /*!

src/components/display/hardware.cpp

@@ -44,12 +44,12 @@ using FnCreateDispDrvTft = std::function<dispDrvBase *(
 // NOTE: When you add a new SPI TFT display driver, make sure to add it to the
 // factory!
 static const std::map<std::string, FnCreateDispDrvTft> FactoryDrvDispTft = {
-    {"st7735",
+    {"tft-154-wide-angle",
      [](int16_t cs, int16_t dc, int16_t mosi, int16_t sck, int16_t rst,
         int16_t miso) -> dispDrvBase * {
        return new dispDrvSt7789(cs, dc, mosi, sck, rst, miso);
      }},
-    {"st7789",
+    {"tft-154-wide-angle",
      [](int16_t cs, int16_t dc, int16_t mosi, int16_t sck, int16_t rst,
         int16_t miso) -> dispDrvBase * {
        return new dispDrvSt7789(cs, dc, mosi, sck, rst, miso);
@@ -344,12 +344,31 @@ bool DisplayHardware::beginTft(
   }
 
   // Create display driver object using the factory function
+  WS_DEBUG_PRINTLN("[display] Creating TFT display driver with pinout: ");
+    WS_DEBUG_PRINT("  CS: D");  WS_DEBUG_PRINTLN(cs);
+    WS_DEBUG_PRINT("  DC: D");  WS_DEBUG_PRINTLN(dc);
+    WS_DEBUG_PRINT("  MOSI: D");WS_DEBUG_PRINTLN(mosi);
+    WS_DEBUG_PRINT("  SCK: D"); WS_DEBUG_PRINTLN(sck);
+    if (rst != -1) {
+        WS_DEBUG_PRINT("  RST: D"); WS_DEBUG_PRINTLN(rst);
+    }
+    if (miso != -1) {
+        WS_DEBUG_PRINT("  MISO: D"); WS_DEBUG_PRINTLN(miso);
+    }
   _drvDisp = CreateDrvDispTft(_name, cs, dc, mosi, sck, rst, miso);
   if (!_drvDisp) {
     WS_DEBUG_PRINTLN("[display] Failed to create display driver!");
     return false;
   }
 
+  // Print configuration
+    WS_DEBUG_PRINTLN("[display] Successfully created tft display driver!");
+    WS_DEBUG_PRINTLN("[display] TFT configuration:");
+    WS_DEBUG_PRINT("  Width: "); WS_DEBUG_PRINTLN(config->width);
+    WS_DEBUG_PRINT("  Height: ");WS_DEBUG_PRINTLN(config->height);
+    WS_DEBUG_PRINT("  Rotation: ");WS_DEBUG_PRINTLN(config->rotation);
+    WS_DEBUG_PRINT("  Text Size: ");WS_DEBUG_PRINTLN(text_sz);
+
   _drvDisp->setWidth(config->width);
   _drvDisp->setHeight(config->height);
   _drvDisp->setRotation(config->rotation);