Merge branch 'master' into feature/energypreferences

Author: drempelg

examples/platform/silabs/BaseApplication.cpp

@@ -458,11 +458,7 @@ void BaseApplication::ButtonHandler(AppEvent * aEvent)
             // - Cycle LCD screen
             CancelFunctionTimer();
 
-            OutputQrCode(false);
-#ifdef DISPLAY_ENABLED
-            UpdateLCDStatusScreen();
-            slLCD.CycleScreens();
-#endif
+            AppTask::GetAppTask().UpdateDisplay();
 
 #ifdef SL_WIFI
             if (!ConnectivityMgr().IsWiFiStationProvisioned())
@@ -493,6 +489,15 @@ void BaseApplication::ButtonHandler(AppEvent * aEvent)
     }
 }
 
+void BaseApplication::UpdateDisplay()
+{
+    OutputQrCode(false);
+#ifdef DISPLAY_ENABLED
+    UpdateLCDStatusScreen();
+    slLCD.CycleScreens();
+#endif
+}
+
 void BaseApplication::CancelFunctionTimer()
 {
     if (xTimerStop(sFunctionTimer, pdMS_TO_TICKS(0)) == pdFAIL)

examples/platform/silabs/BaseApplication.h

@@ -105,6 +105,11 @@ 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

examples/platform/silabs/display/lcd.h

@@ -71,6 +71,7 @@ class SilabsLCD
     void SetScreen(Screen_e screen);
     void CycleScreens(void);
     void SetStatus(DisplayStatus_t & status);
+    void WriteStatus();
 
 #ifdef QR_CODE_ENABLED
     void SetQRCode(uint8_t * str, uint32_t size);
@@ -85,7 +86,6 @@ class SilabsLCD
     } DemoState_t;
 
     void WriteDemoUI();
-    void WriteStatus();
 
 #ifdef QR_CODE_ENABLED
     void WriteQRCode();