[SMCO] Add mExpressedStatePriority

project-chip · Jul 4, 2023 · 75c0385 · 75c0385
1 parent 4279d22
commit 75c0385
Show file tree

Hide file tree

Showing 3 changed files with 299 additions and 183 deletions.
diff --git a/examples/smoke-co-alarm-app/silabs/include/SmokeCoAlarmManager.h b/examples/smoke-co-alarm-app/silabs/include/SmokeCoAlarmManager.h
@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include <map>
 #include <stdbool.h>
 #include <stdint.h>
 
@@ -42,6 +41,12 @@ class SmokeCoAlarmManager
      */
     bool StartSelfTesting();
 
+    /**
+     * @brief Execute the HandleEventTrigger process
+     *
+     */
+    bool StartHandleEventTrigger(uint64_t eventTrigger);
+
     /**
      * @brief Updates the expressed state with new value
      *
@@ -59,7 +64,24 @@ class SmokeCoAlarmManager
      * @brief Record expressed state in decreasing priority
      *
      */
-    std::map<ExpressedStateEnum, bool> mExpressedState;
+    std::array<ExpressedStateEnum, 9> mExpressedStatePriority;
+
+    /**
+     * @brief Expression status record values
+     *
+     */
+    int mExpressedStateMask = 1;
+
+    bool mSelfTesting;
+    bool mHandleEventTrigger;
+    uint64_t mEventTrigger;
+
+    void CancelTimer(void);
+    void StartTimer(uint32_t aTimeoutMs);
+
+    static void TimerEventHandler(TimerHandle_t xTimer);
+    static void SelfTestingTimerEventHandler(AppEvent * aEvent);
+    static void EventTriggerTimerEventHandler(AppEvent * aEvent);
 
     static SmokeCoAlarmManager sAlarm;
 };