updating the PR based on comments

Author: chirag-silabs

examples/lighting-app/silabs/include/AppEvent.h

@@ -19,6 +19,9 @@
 
 #pragma once
 
+#ifdef DISPLAY_ENABLED
+#include "lcd.h"
+#endif
 struct AppEvent;
 typedef void (*EventHandler)(AppEvent *);
 
@@ -44,7 +47,7 @@ struct AppEvent
 #ifdef DISPLAY_ENABLED
         struct
         {
-            void * screen;
+            SilabsLCD::Screen_e screen;
         } LCDEvent;
 #endif
         struct

examples/platform/silabs/BaseApplication.cpp

@@ -251,11 +251,7 @@ void BaseApplicationDelegate::OnCommissioningWindowClosed()
         SilabsLCD::Screen_e screen;
         slLCD.GetScreen(screen);
         VerifyOrReturn(screen == SilabsLCD::Screen_e::QRCodeScreen);
-        AppEvent event;
-        event.Type            = AppEvent::kEventType_LCD;
-        event.LCDEvent.screen = reinterpret_cast<void *>(static_cast<uintptr_t>(SilabsLCD::Screen_e::DemoScreen));
-        event.Handler         = AppTask::GetAppTask().UpdateDisplayHandler;
-        BaseApplication::PostEvent(&event);
+        BaseApplication::PostUpdateDisplayEvent(SilabsLCD::Screen_e::DemoScreen);
 #endif // QR_CODE_ENABLED
 #endif // DISPLAY_ENABLED
     }
@@ -625,31 +621,15 @@ void BaseApplication::ButtonHandler(AppEvent * aEvent)
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
             }
 
-            AppEvent event;
-            event.Type            = AppEvent::kEventType_LCD;
-            event.LCDEvent.screen = reinterpret_cast<void *>(static_cast<uintptr_t>(SilabsLCD::Screen_e::CycleScreen));
-            event.Handler         = AppTask::GetAppTask().UpdateDisplayHandler;
-            PostEvent(&event);
+            // Print the QR Code
+            OutputQrCode(false);
+#ifdef DISPLAY_ENABLED
+            PostUpdateDisplayEvent(SilabsLCD::Screen_e::CycleScreen);
+#endif // DISPLAY_ENABLED
         }
     }
 }
 
-void BaseApplication::UpdateDisplayHandler(AppEvent * aEvent)
-{
-    VerifyOrReturn(aEvent->Type == AppEvent::kEventType_LCD);
-    SilabsLCD::Screen_e screen = static_cast<SilabsLCD::Screen_e>(reinterpret_cast<uintptr_t>(aEvent->LCDEvent.screen));
-    (screen == SilabsLCD::Screen_e::CycleScreen) ? AppTask::GetAppTask().UpdateDisplay() : AppTask::GetLCD().SetScreen(screen);
-}
-
-void BaseApplication::UpdateDisplay()
-{
-    OutputQrCode(false);
-#ifdef DISPLAY_ENABLED
-    UpdateLCDStatusScreen();
-    slLCD.CycleScreens();
-#endif
-}
-
 void BaseApplication::CancelFunctionTimer()
 {
     if (osTimerStop(sFunctionTimer) == osError)
@@ -808,6 +788,32 @@ SilabsLCD & BaseApplication::GetLCD(void)
     return slLCD;
 }
 
+void BaseApplication::PostUpdateDisplayEvent(SilabsLCD::Screen_e screen)
+{
+    AppEvent event;
+    event.Type            = AppEvent::kEventType_LCD;
+    event.LCDEvent.screen = screen;
+    event.Handler         = AppTask::GetAppTask().UpdateDisplayHandler;
+    BaseApplication::PostEvent(&event);
+}
+
+void BaseApplication::UpdateDisplayHandler(AppEvent * aEvent)
+{
+    VerifyOrReturn(aEvent->Type == AppEvent::kEventType_LCD);
+    SilabsLCD::Screen_e screen = aEvent->LCDEvent.screen;
+    if (screen == SilabsLCD::Screen_e::StatusScreen)
+    {
+        UpdateLCDStatusScreen();
+    }
+    (screen == SilabsLCD::Screen_e::CycleScreen) ? AppTask::GetAppTask().UpdateDisplay() : AppTask::GetLCD().SetScreen(screen);
+}
+
+void BaseApplication::UpdateDisplay()
+{
+    UpdateLCDStatusScreen();
+    slLCD.CycleScreens();
+}
+
 void BaseApplication::UpdateLCDStatusScreen()
 {
     SilabsLCD::DisplayStatus_t status;
@@ -944,11 +950,7 @@ void BaseApplication::OnPlatformEvent(const ChipDeviceEvent * event, intptr_t)
         // Update the LCD screen with SSID and connected state
         if (screen == SilabsLCD::Screen_e::StatusScreen)
         {
-            AppEvent event;
-            event.Type            = AppEvent::kEventType_LCD;
-            event.LCDEvent.screen = reinterpret_cast<void *>(static_cast<uintptr_t>(SilabsLCD::Screen_e::StatusScreen));
-            event.Handler         = AppTask::GetAppTask().UpdateDisplayHandler;
-            PostEvent(&event);
+            PostUpdateDisplayEvent(SilabsLCD::Screen_e::StatusScreen);
         }
 #endif // DISPLAY_ENABLED
 

examples/platform/silabs/BaseApplication.h

@@ -127,11 +127,6 @@ class BaseApplication
 
     static void PostEvent(const AppEvent * event);
 
-    /**
-     * @brief Overridable function used to update display on button press
-     */
-    virtual void UpdateDisplay();
-
 #ifdef DISPLAY_ENABLED
     /**
      * @brief Return LCD object
@@ -140,13 +135,25 @@ class BaseApplication
 
     static void UpdateLCDStatusScreen();
 
+    /**
+     * @brief Overridable function used to update display on button press
+     */
+    virtual void UpdateDisplay();
+
     /**
      * @brief LCD Event processing function
      *        Update the LCD status based on the screen
      *
      * @param aEvent post event being processed
      */
     static void UpdateDisplayHandler(AppEvent * aEvent);
+
+    /**
+     * @brief Post an event to update the display screen
+     *
+     * @param screen The screen to be displayed
+     */
+    static void PostUpdateDisplayEvent(SilabsLCD::Screen_e screen);
 #endif
 
     /**

examples/platform/silabs/display/lcd.h

@@ -39,8 +39,8 @@ class SilabsLCD
 #ifdef QR_CODE_ENABLED
         QRCodeScreen,
 #endif
-        InvalidScreen,
         CycleScreen,
+        InvalidScreen,
     } Screen_e;
 
     typedef enum icdMode