Use enum for butten mode change

project-chip · Oct 14, 2021 · d4ea94a · d4ea94a
1 parent 2162a3e
commit d4ea94a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/examples/window-app/common/include/WindowApp.h b/examples/window-app/common/include/WindowApp.h
@@ -89,6 +89,12 @@ class WindowApp
         BLEConnectionsChanged,
     };
 
+    enum ButtonCtrlMode
+    {
+        Tilt = 0,
+        Lift,
+    };
+
     struct Event
     {
         Event(EventId id) : mId(id), mEndpoint(0) {}
@@ -154,8 +160,10 @@ class WindowApp
     Timer * mLongPressTimer = nullptr;
     Button * mButtonUp      = nullptr;
     Button * mButtonDown    = nullptr;
+    ButtonCtrlMode mButtonCtrlMode;
+
     StateFlags mState;
-    bool mTiltMode       = false;
+
     bool mUpPressed      = false;
     bool mDownPressed    = false;
     bool mUpSuppressed   = false;

diff --git a/examples/window-app/common/src/WindowApp.cpp b/examples/window-app/common/src/WindowApp.cpp
@@ -189,7 +189,11 @@ void WindowApp::DispatchEvent(const WindowApp::Event & event)
         }
         else if (mDownPressed)
         {
-            mTiltMode     = !mTiltMode;
+            if (ButtonCtrlMode::Tilt == mButtonCtrlMode)
+                mButtonCtrlMode = ButtonCtrlMode::Lift;
+            else
+                mButtonCtrlMode = ButtonCtrlMode::Tilt;
+
             mUpSuppressed = mDownSuppressed = true;
             PostEvent(EventId::TiltModeChange);
         }
@@ -227,7 +231,11 @@ void WindowApp::DispatchEvent(const WindowApp::Event & event)
         }
         else if (mUpPressed)
         {
-            mTiltMode     = !mTiltMode;
+            if (ButtonCtrlMode::Tilt == mButtonCtrlMode)
+                mButtonCtrlMode = ButtonCtrlMode::Lift;
+            else
+                mButtonCtrlMode = ButtonCtrlMode::Tilt;
+
             mUpSuppressed = mDownSuppressed = true;
             PostEvent(EventId::TiltModeChange);
         }

diff --git a/examples/window-app/efr32/src/WindowAppImpl.cpp b/examples/window-app/efr32/src/WindowAppImpl.cpp
@@ -277,7 +277,13 @@ void WindowAppImpl::DispatchEvent(const WindowApp::Event & event)
         break;
     case EventId::TiltModeChange:
         mIconTimer.Start();
-        mIcon = mTiltMode ? LcdIcon::Tilt : LcdIcon::Lift;
+        switch (mButtonCtrlMode)
+        {
+        case ButtonCtrlMode::Tilt: mIcon = LcdIcon::Tilt; break;
+        case ButtonCtrlMode::Lift: mIcon = LcdIcon::Lift; break;
+        default:
+            break;
+        }
         UpdateLCD();
         break;
     default: