Fix: Text resize on Tft, Bug: Text resize improperly due to no deinit

Author: brentru

src/Wippersnapper_demo.ino.cpp

@@ -0,0 +1,26 @@
+# 1 "/var/folders/ff/dmzflvf52tq9kzvt6g8jglxw0000gn/T/tmp4dvs_pq5"
+#include <Arduino.h>
+# 1 "/Users/brentrubell/Documents/Arduino/libraries/Adafruit_Wippersnapper_Arduino/src/Wippersnapper_demo.ino"
+# 16 "/Users/brentrubell/Documents/Arduino/libraries/Adafruit_Wippersnapper_Arduino/src/Wippersnapper_demo.ino"
+#include "Wippersnapper_Networking.h"
+Wippersnapper_WiFi wipper;
+
+
+#define WS_DEBUG
+void setup();
+void loop();
+#line 22 "/Users/brentrubell/Documents/Arduino/libraries/Adafruit_Wippersnapper_Arduino/src/Wippersnapper_demo.ino"
+void setup() {
+
+  wipper.provision();
+
+  Serial.begin(115200);
+
+
+  wipper.connect();
+
+}
+
+void loop() {
+  wipper.run();
+}

src/components/display/controller.cpp

@@ -45,6 +45,16 @@ bool DisplayController::Handle_Display_AddOrReplace(
   WS_DEBUG_PRINT("[display] Adding or replacing display: ");
   WS_DEBUG_PRINTLN(msgAdd->name);
 
+  // Does this display hw instance already exist?
+  for (auto it = _hw_instances.begin(); it != _hw_instances.end(); ++it) {
+      if (strcmp((*it)->getName(), msgAdd->name) == 0) {
+      WS_DEBUG_PRINTLN("[display] Display instance already exists, removing...");
+      delete *it;
+      _hw_instances.erase(it);
+      break;
+      }
+  }
+
   // Configure display type
   display->setType(msgAdd->type);
 

src/components/display/drivers/dispDrvSt7789.h

@@ -18,7 +18,6 @@
 #include "dispDrvBase.h"
 #include <Adafruit_ST7789.h>
 
-#define ST7789_TEXT_SZ_DEFAULT 2    ///< Default text size for ST7789 displays
 #define ST7789_STATUSBAR_HEIGHT 20  ///< Default status bar height
 #define ST7789_STATUSBAR_ICON_SZ 16 ///< Default status bar icon size
 #define ST7789_STATUSBAR_ICON_SPACING                                          \
@@ -81,7 +80,6 @@ class dispDrvSt7789 : public dispDrvBase {
 
     _display->init(_width, _height);
     _display->setRotation(_rotation);
-    setTextSize(ST7789_TEXT_SZ_DEFAULT);
     _display->fillScreen(ST77XX_BLACK);
     _display->setTextColor(ST77XX_WHITE);
 
@@ -100,20 +98,6 @@ class dispDrvSt7789 : public dispDrvBase {
     return true;
   }
 
-  /*!
-      @brief  Sets the text size for the display.
-      @param  s
-              The text size to set.
-      @note   This method overrides the base class method to provide specific
-              functionality for the ST7789 driver.
-  */
-  void setTextSize(uint8_t s) override {
-    if (!_display)
-      return;
-    _text_sz = s;
-    _display->setTextSize(s);
-  }
-
   /*!
       @brief  Displays the splash screen on the display.
   */
@@ -176,6 +160,12 @@ class dispDrvSt7789 : public dispDrvBase {
     _display->drawBitmap(_statusbar_icon_battery_x, _statusbar_icons_y,
                          epd_bmp_bat_full, ST7789_STATUSBAR_ICON_SZ,
                          ST7789_STATUSBAR_ICON_SZ, ST77XX_BLACK);
+    
+    // Reset text color and size for main text area
+    _display->setTextColor(ST77XX_WHITE);
+    WS_DEBUG_PRINTLN("SB Text Size:");
+    WS_DEBUG_PRINTLN(_text_sz);
+    _display->setTextSize(_text_sz);
   }
 
   /*!
@@ -254,8 +244,6 @@ class dispDrvSt7789 : public dispDrvBase {
     if (_display == nullptr)
       return;
 
-    _display->setTextColor(ST77XX_WHITE);
-
     // Clear only the area below the status bar
     _display->fillRect(0, ST7789_STATUSBAR_HEIGHT, _width,
                        _height - ST7789_STATUSBAR_HEIGHT, ST77XX_BLACK);

src/components/display/hardware.cpp

@@ -216,19 +216,6 @@ bool DisplayHardware::beginEPD(
     return false;
   }
 
-/*   // For "magtag" component name, attempt to autodetect the driver type
-  if (strncmp(_name, "eink-29-grayscale-ssd1680", 6) == 0) {
-    if (detect_ssd1680(cs, dc, rst)) {
-      // Detected SSD1680, use EAAMFGN driver
-      strncpy(_name, "thinkink-gs4-eaamfgn", sizeof(_name) - 1);
-      _name[sizeof(_name) - 1] = '\0';
-    } else {
-      // Did not detect SSD1680, use IL0373 driver
-      strncpy(_name, "thinkink-gs4-t5", sizeof(_name) - 1);
-      _name[sizeof(_name) - 1] = '\0';
-    }
-  } */
-
   // Create display driver object using the factory function
   _drvDisp = CreateDrvDispEpd(_name, dc, rst, cs, srcs, busy);
   if (!_drvDisp) {
@@ -332,9 +319,6 @@ bool DisplayHardware::beginTft(
     miso = parsePin(spi_config->pin_miso);
   }
 
-  // TODO: Implement Text_size based on future Protobuf that includes it
-  uint8_t text_sz; // Default text size
-
   // Create display driver object using the factory function
   _drvDisp = CreateDrvDispTft(_name, cs, dc, mosi, sck, rst, miso);
   if (!_drvDisp) {