Fixed button handling in dimmer-switch app

Author: arun-silabs

examples/light-switch-app/silabs/include/AppTask.h

@@ -57,6 +57,29 @@ class AppTask : public BaseApplication
 
     static AppTask & GetAppTask() { return sAppTask; }
 
+    struct Timer
+    {
+        typedef void (*Callback)(Timer & timer);
+
+        Timer(uint32_t timeoutInMs, Callback callback, void * context);
+        ~Timer();
+
+        void Start();
+        void Stop();
+        void Timeout();
+
+        Callback mCallback = nullptr;
+        void * mContext    = nullptr;
+        bool mIsActive     = false;
+
+        osTimerId_t mHandler = nullptr;
+
+    private:
+        static void TimerCallback(void * timerCbArg);
+    };
+
+    Timer * longPressTimer      = nullptr;
+
     /**
      * @brief AppTask task main loop function
      *
@@ -65,6 +88,19 @@ class AppTask : public BaseApplication
     static void AppTaskMain(void * pvParameter);
 
     CHIP_ERROR StartAppTask();
+    /**
+     * @brief Event handler when a button is pressed
+     * Function posts an event for button processing
+     *
+     * @param buttonHandle BTN0 or BTN1
+     * @param btnAction button action - SL_SIMPLE_BUTTON_PRESSED,
+     *                  SL_SIMPLE_BUTTON_RELEASED or SL_SIMPLE_BUTTON_DISABLED
+     */
+    static void ButtonEventHandler(uint8_t button, uint8_t btnAction);
+
+    AppEvent CreateNewEvent(AppEvent::AppEventTypes type);
+
+    static void AppEventHandler(AppEvent * aEvent);
 
 private:
     static AppTask sAppTask;
@@ -75,4 +111,20 @@ class AppTask : public BaseApplication
      * @return CHIP_ERROR
      */
     CHIP_ERROR Init();
+
+    /**
+     * @brief PB1 Button event processing function
+     *        Function triggers a switch action sent to the CHIP task
+     *
+     * @param aEvent button event being processed
+     */
+    static void SwitchActionEventHandler(AppEvent * aEvent);
+
+    static void OnLongPressTimeout(Timer & timer);
+
+    /**
+     * @brief This function will be called when PB1 is
+     *        long-pressed to trigger the level-control action
+     */
+    void HandleLongPress();
 };

examples/light-switch-app/silabs/include/LightSwitchMgr.h

@@ -52,84 +52,37 @@ class LightSwitchMgr
         .stepSize = 1, .transitionTime = 0, .optionsMask = 0, .optionsOverride = 0
     };
 
-    struct Timer
-    {
-        typedef void (*Callback)(Timer & timer);
-
-        Timer(uint32_t timeoutInMs, Callback callback, void * context);
-        ~Timer();
-
-        void Start();
-        void Stop();
-        void Timeout();
-
-        Callback mCallback = nullptr;
-        void * mContext    = nullptr;
-        bool mIsActive     = false;
-
-        osTimerId_t mHandler = nullptr;
-
-    private:
-        static void TimerCallback(void * timerCbArg);
-    };
-
     CHIP_ERROR Init(chip::EndpointId lightSwitchEndpoint, chip::EndpointId genericSwitchEndpoint);
 
     void GenericSwitchOnInitialPress();
     void GenericSwitchOnShortRelease();
 
+    /**
+     * @brief Button event processing function
+     *        Function triggers a switch action sent to the CHIP task
+     *
+     * @param aEvent button event being processed
+     */
+    static void SwitchActionEventHandler(AppEvent * aEvent);
+
     void TriggerLightSwitchAction(LightSwitchAction action, bool isGroupCommand = false);
     void TriggerLevelControlAction(StepModeEnum stepMode, bool isGroupCommand = false);
 
     StepModeEnum getStepMode();
-
-    AppEvent CreateNewEvent(AppEvent::AppEventTypes type);
+    void changeStepMode();
 
     static LightSwitchMgr & GetInstance() { return sSwitch; }
 
-    /**
-     * @brief Event handler when a button is pressed
-     * Function posts an event for button processing
-     *
-     * @param button BUTTON0 or BUTTON1
-     * @param btnAction button action - SL_SIMPLE_BUTTON_PRESSED,
-     *                  SL_SIMPLE_BUTTON_RELEASED
-     */
-    static void ButtonEventHandler(uint8_t button, uint8_t btnAction);
-
-    static void AppEventHandler(AppEvent * aEvent);
-
 private:
     static LightSwitchMgr sSwitch;
 
-    Timer * mLongPressTimer      = nullptr;
-    bool mFunctionButtonPressed  = false; // True when button0 is pressed, used to trigger factory reset
-    bool mActionButtonPressed    = false; // True when button1 is pressed, used to initiate toggle or level-up/down
-    bool mActionButtonSuppressed = false; // True when both button0 and button1 are pressed, used to switch step direction
-    bool mResetWarning           = false;
-
     // Default Step direction for Level control
     StepModeEnum stepDirection = StepModeEnum::kUp;
-
-    static void OnLongPressTimeout(Timer & timer);
     LightSwitchMgr() = default;
 
-    /**
-     * @brief This function will be called when PB0 is
-     *        long-pressed to trigger the factory-reset
-     */
-    void HandleLongPress();
-
     static void GenericSwitchWorkerFunction(intptr_t context);
 
     chip::EndpointId mLightSwitchEndpoint   = chip::kInvalidEndpointId;
     chip::EndpointId mGenericSwitchEndpoint = chip::kInvalidEndpointId;
 
-    /**
-     * @brief Button event processing function
-     *        Function triggers a switch action sent to the CHIP task
-     *
-     * @param aEvent button event being processed
-     */
-    static void SwitchActionEventHandler(AppEvent * aEvent);
 };