Fix - MagTag text size, wrong WipperSnapper object called

Author: brentru

src/components/display/controller.cpp

@@ -87,11 +87,10 @@ bool DisplayController::Handle_Display_AddOrReplace(
   display->showSplash();
   WS.runNetFSM();
   display->drawStatusBar(WS._config.aio_user);
-  WS.feedWDT();
+  WS.runNetFSM();
 
   _hw_instances.push_back(display); // Store the display instance
   WS_DEBUG_PRINTLN("[display] Display added or replaced successfully!");
-  WS.feedWDT();
   WS.runNetFSM();
   return true;
 }
@@ -176,10 +175,8 @@ void DisplayController::update(int32_t rssi, bool is_connected) {
     // yet.
     WS_DEBUG_PRINTLN("[display] Updating status bar...");
     hw_instance->updateStatusBar(rssi, 100, is_connected);
+    WS.runNetFSM();
   }
-
-  WS.feedWDT();
-  WS.runNetFSM();
 }
 
 /*!

src/components/display/controller.h

@@ -17,8 +17,8 @@
 #include "Wippersnapper.h"
 #include "hardware.h"
 
-class Wippersnapper_V2; ///< Forward declaration
-class DisplayHardware;  ///< Forward declaration
+class Wippersnapper;   ///< Forward declaration
+class DisplayHardware; ///< Forward declaration
 
 /**************************************************************************/
 /*!
@@ -43,5 +43,5 @@ class DisplayController {
       _hw_instances; ///< Holds pointers to DisplayHardware instances
   unsigned long _last_bar_update; ///< Timestamp of last status bar update
 };
-extern Wippersnapper Ws; ///< Global WS instance
+extern Wippersnapper WS; ///< Global WS instance
 #endif

src/components/display/drivers/dispDrvThinkInkGrayscale4T5.h

@@ -25,8 +25,7 @@
 class dispDrvThinkInkGrayscale4T5 : public dispDrvBase {
 public:
   /*!
-      @brief  Constructor for the ThinkInk Grayscale 4-level EAAMFGN display
-               driver.
+      @brief  Constructor for the ThinkInk Grayscale T5 EPD display driver.
       @param  dc
               Data/Command pin for the display.
       @param  rst
@@ -53,7 +52,7 @@ class dispDrvThinkInkGrayscale4T5 : public dispDrvBase {
   }
 
   /*!
-      @brief  Attempts to initialize the ThinkInk Grayscale 4-level EAAMFGN
+      @brief  Attempts to initialize the ThinkInk Grayscale 4 T5 EPD
               display driver.
       @param  mode
               The ThinkInk mode to use for the display.
@@ -70,7 +69,6 @@ class dispDrvThinkInkGrayscale4T5 : public dispDrvBase {
     // Initialize the display
     _display->begin(mode);
     // Configure display settings
-    _text_sz = 3;
     _display->setTextSize(_text_sz);
     _display->setTextColor(EPD_BLACK);
     _display->setTextWrap(false);

src/components/display/hardware.cpp

@@ -238,8 +238,7 @@ bool DisplayHardware::beginEPD(
     _drvDisp = nullptr;
     return false;
   }
-  WS_DEBUG_PRINTLN("[display] Text Magnification: ");
-  WS_DEBUG_PRINTLN(config->text_size);
+
   _drvDisp->setTextSize(config->text_size);
 
   if (!_drvDisp->begin(epd_mode)) {