Updated LcdPainter class

Author: silabs-ArghyaD

examples/window-app/silabs/include/LcdPainter.h

@@ -33,11 +33,24 @@ enum class LcdIcon
     Tilt
 };
 
+using chip::app::Clusters::WindowCovering::Type;
+
 class LcdPainter
 {
 public:
-    static void Paint(SilabsLCD & lcd, chip::app::Clusters::WindowCovering::Type type, uint16_t lift, uint16_t tilt, LcdIcon icon);
+    /** Binds the display used by static Paint(); call once after GetLCD().Init() (e.g. from WindowManager::Init). */
+    explicit LcdPainter(SilabsLCD & lcd);
+
+    static void Paint(Type type, uint16_t lift, uint16_t tilt, LcdIcon icon);
+
+    LcdPainter(const LcdPainter &)             = delete;
+    LcdPainter & operator=(const LcdPainter &) = delete;
+    LcdPainter(LcdPainter &&)                  = delete;
+    LcdPainter & operator=(LcdPainter &&)     = delete;
 
 private:
-    static void ClearScreen(SilabsLCD & lcd);
+    static void ClearScreen();
+
+    static SilabsLCD * sLcd;
+    static bool mLcdCleared;
 };

examples/window-app/silabs/src/LcdPainter.cpp

@@ -19,19 +19,19 @@
 
 #include "demo-ui-bitmaps.h"
 #include <LcdPainter.h>
-
+#include <AppConfig.h>
 #include <cstdint>
 #include <cstdio>
 
 using namespace chip::app::Clusters::WindowCovering;
 
+SilabsLCD * LcdPainter::sLcd       = nullptr;
+bool LcdPainter::mLcdCleared      = false;
+
 namespace {
 static const uint8_t sSilabsLogoSmall[] = { SILABS_LOGO_SMALL };
 static const uint8_t sMatterLogo[]      = { MATTER_LOGO_BITMAP };
 
-// Shared with ClearScreen: first Paint draws logos, title, and Lift/Tilt labels; percent row updates every Paint.
-static bool sLcdCleared = false;
-
 static unsigned RawToWholePercent(uint16_t raw, int openLimit, int closedLimit)
 {
     const int denom = closedLimit - openLimit;
@@ -43,41 +43,52 @@ static unsigned RawToWholePercent(uint16_t raw, int openLimit, int closedLimit)
 }
 } // namespace
 
-void LcdPainter::ClearScreen(SilabsLCD & lcd)
+LcdPainter::LcdPainter(SilabsLCD & lcd)
+{
+    sLcd = &lcd;
+}
+
+void LcdPainter::ClearScreen()
 {
-    if (sLcdCleared)
+    if (mLcdCleared || sLcd == nullptr)
     {
         return;
     }
-    lcd.Clear();
-    lcd.Update();
-    sLcdCleared = true;
+    sLcd->Clear();
+    sLcd->Update();
+    mLcdCleared = true;
 }
 
-void LcdPainter::Paint(SilabsLCD & lcd, Type type, uint16_t lift, uint16_t tilt, LcdIcon icon)
+void LcdPainter::Paint(Type type, uint16_t lift, uint16_t tilt, LcdIcon icon)
 {
     (void) type;
+    (void) icon;
+
+    if (sLcd == nullptr)
+    {
+        return;
+    }
 
-    const bool drawStaticChrome = !sLcdCleared;
-    ClearScreen(lcd);
+    const bool drawStaticChrome = !mLcdCleared;
+    ClearScreen();
 
     const unsigned liftPct = RawToWholePercent(lift, LIFT_OPEN_LIMIT, LIFT_CLOSED_LIMIT);
     const unsigned tiltPct = RawToWholePercent(tilt, TILT_OPEN_LIMIT, TILT_CLOSED_LIMIT);
 
-    GLIB_Context_t * glibContext = static_cast<GLIB_Context_t *>(lcd.Context());
+    GLIB_Context_t * glibContext = static_cast<GLIB_Context_t *>(sLcd->Context());
     const int32_t xSize          = glibContext->pDisplayGeometry->xSize;
 
     char buf[32];
     if (drawStaticChrome)
     {
         const int32_t silabsX = (xSize - SILABS_LOGO_WIDTH) / 2;
-        (void) GLIB_drawBitmap(glibContext, silabsX, 0, SILABS_LOGO_WIDTH, SILABS_LOGO_HEIGHT, sSilabsLogoSmall);
-        (void) GLIB_drawBitmap(glibContext, MATTER_ICON_POSITION_X, 4, MATTER_LOGO_WIDTH, MATTER_LOGO_HEIGHT, sMatterLogo);
+        GLIB_drawBitmap(glibContext, silabsX, 0, SILABS_LOGO_WIDTH, SILABS_LOGO_HEIGHT, sSilabsLogoSmall);
+        GLIB_drawBitmap(glibContext, MATTER_ICON_POSITION_X, 4, MATTER_LOGO_WIDTH, MATTER_LOGO_HEIGHT, sMatterLogo);
 
-        (void) GLIB_drawStringOnLine(glibContext, "Window App", 4, GLIB_ALIGN_CENTER, 0, 0, true);
-        (void) GLIB_drawStringOnLine(glibContext, "Lift Tilt", 6, GLIB_ALIGN_CENTER, 0, 0, true);
+        GLIB_drawStringOnLine(glibContext, "Window App", 4, GLIB_ALIGN_CENTER, 0, 0, true);
+        GLIB_drawStringOnLine(glibContext, "Lift Tilt", 6, GLIB_ALIGN_CENTER, 0, 0, true);
     }
     snprintf(buf, sizeof(buf), "%3u%% %3u%%", liftPct, tiltPct);
-    (void) GLIB_drawStringOnLine(glibContext, buf, 8, GLIB_ALIGN_CENTER, 0, 0, true);
-    lcd.Update();
+    GLIB_drawStringOnLine(glibContext, buf, 8, GLIB_ALIGN_CENTER, 0, 0, true);
+    sLcd->Update();
 }

examples/window-app/silabs/src/WindowManager.cpp

@@ -41,10 +41,6 @@
 #include <platform/silabs/wifi/WifiInterface.h>
 #endif
 
-#ifdef DISPLAY_ENABLED
-#include <LcdPainter.h>
-#endif
-
 #include <platform/silabs/platformAbstraction/SilabsPlatform.h>
 
 #define LCD_ICON_TIMEOUT 1000
@@ -606,6 +602,11 @@ CHIP_ERROR WindowManager::Init()
     mActionLED.Init(APP_ACTION_LED);
     AppTask::GetAppTask().LinkAppLed(&mActionLED);
 
+#ifdef DISPLAY_ENABLED
+    // Binds SilabsLCD for LcdPainter::Paint; runs once after GetLCD().Init() in BaseInit().
+    static LcdPainter sLcdRegistration(AppTask::GetAppTask().GetLCD());
+#endif
+
     chip::DeviceLayer::PlatformMgr().UnlockChipStack();
 
     return CHIP_NO_ERROR;
@@ -686,7 +687,7 @@ void WindowManager::UpdateLCD()
 
         if (!tilt.IsNull() && !lift.IsNull())
         {
-            LcdPainter::Paint(AppTask::GetAppTask().GetLCD(), type, lift.Value(), tilt.Value(), mIcon);
+            LcdPainter::Paint(type, lift.Value(), tilt.Value(), mIcon);
         }
     }
 }