Make FSM sensitive to multi zone touch events

eurofurence · Sep 6, 2024 · b8412ae · b8412ae
1 parent 75d3d30
commit b8412ae
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 9 deletions.
diff --git a/include/FSMEvent.h b/include/FSMEvent.h
@@ -34,6 +34,8 @@
  */
 enum class FSMEvent {
     NoOp,
+    AllShortpress,
+    AllLongpress,
     FingerprintTouch,
     FingerprintRelease,
     FingerprintShortpress,

diff --git a/include/FSMState.h b/include/FSMState.h
@@ -138,6 +138,15 @@ class FSMState {
          */
         virtual std::unique_ptr<FSMState> touchEventNoseLongpress();
 
+        /**
+         * @brief Executed on FSMEvent::AllShortpress
+         */
+        virtual std::unique_ptr<FSMState> touchEventAllShortpress();
+
+        /**
+         * @brief Executed on FSMEvent::AllLongpress
+         */
+        virtual std::unique_ptr<FSMState> touchEventAllLongpress();
 };
 
 /**

diff --git a/src/main.cpp b/src/main.cpp
@@ -246,6 +246,25 @@ void setup() {
  */
 void loop() {
     // Handler: ISR Events
+    if (isrEvents.allLongpress) {
+        fsm.queueEvent(FSMEvent::AllLongpress);
+        isrEvents.noseLongpress = false;
+        isrEvents.noseShortpress = false;
+        isrEvents.noseRelease = false;
+        isrEvents.fingerprintLongpress = false;
+        isrEvents.fingerprintShortpress = false;
+        isrEvents.fingerprintRelease = false;
+        isrEvents.allLongpress = false;
+        isrEvents.allShortpress = false;
+    }
+    if (isrEvents.allShortpress) {
+        fsm.queueEvent(FSMEvent::AllShortpress);
+        isrEvents.noseShortpress = false;
+        isrEvents.noseRelease = false;
+        isrEvents.fingerprintShortpress = false;
+        isrEvents.fingerprintRelease = false;
+        isrEvents.allShortpress = false;
+    }
     if (isrEvents.fingerprintTouch) {
         fsm.queueEvent(FSMEvent::FingerprintTouch);
         isrEvents.fingerprintTouch = false;
@@ -285,15 +304,6 @@ void loop() {
         fsm.queueEvent(FSMEvent::NoseRelease);
         isrEvents.noseRelease = false;
     }
-    if (isrEvents.allLongpress) {
-        LOG_INFO("ALL LONG");
-        isrEvents.allLongpress = false;
-        isrEvents.allShortpress = false;
-    }
-    if (isrEvents.allShortpress) {
-        LOG_INFO("ALL SHORT");
-        isrEvents.allShortpress = false;
-    }
 
     // Task: Handle FSM
     if (task_fsm_handle < millis()) {

diff --git a/src/states/FSMState.cpp b/src/states/FSMState.cpp
@@ -87,3 +87,11 @@ std::unique_ptr<FSMState> FSMState::touchEventNoseShortpress() {
 std::unique_ptr<FSMState> FSMState::touchEventNoseLongpress() {
     return nullptr;
 }
+
+std::unique_ptr<FSMState> FSMState::touchEventAllShortpress() {
+    return nullptr;
+}
+
+std::unique_ptr<FSMState> FSMState::touchEventAllLongpress() {
+    return nullptr;
+}