Add Button 3 event handler

project-chip · Aug 20, 2020 · 09873b3 · 09873b3
1 parent edac1aa
commit 09873b3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/examples/lock-app/nrfconnect/main/AppTask.cpp b/examples/lock-app/nrfconnect/main/AppTask.cpp
@@ -209,6 +209,14 @@ void AppTask::ButtonEventHandler(uint32_t button_state, uint32_t has_changed)
         button_event.Handler            = FunctionHandler;
         sAppTask.PostEvent(&button_event);
     }
+
+    if (JOINER_BUTTON_MASK & button_state & has_changed)
+    {
+        button_event.ButtonEvent.PinNo  = JOINER_BUTTON;
+        button_event.ButtonEvent.Action = BUTTON_PUSH_EVENT;
+        button_event.Handler            = JoinerHandler;
+        sAppTask.PostEvent(&button_event);
+    }
 }
 
 void AppTask::TimerEventHandler(k_timer * timer)
@@ -299,6 +307,16 @@ void AppTask::FunctionHandler(AppEvent * aEvent)
     }
 }
 
+void AppTask::JoinerHandler(AppEvent * aEvent)
+{
+    if (aEvent->ButtonEvent.PinNo != JOINER_BUTTON)
+        return;
+
+    CHIP_ERROR error = CHIP_ERROR_NOT_IMPLEMENTED;
+
+    LOG_INF("Thread joiner triggering result: %s", chip::ErrorStr(error));
+}
+
 void AppTask::CancelTimer()
 {
     k_timer_stop(&sFunctionTimer);

diff --git a/examples/lock-app/nrfconnect/main/include/AppTask.h b/examples/lock-app/nrfconnect/main/include/AppTask.h
@@ -47,6 +47,7 @@ class AppTask
 
     static void FunctionTimerEventHandler(AppEvent * aEvent);
     static void FunctionHandler(AppEvent * aEvent);
+    static void JoinerHandler(AppEvent * aEvent);
     static void LockActionEventHandler(AppEvent * aEvent);
 
     static void ButtonEventHandler(uint32_t buttons_state, uint32_t has_changed);

diff --git a/examples/lock-app/nrfconnect/main/include/app_config.h b/examples/lock-app/nrfconnect/main/include/app_config.h
@@ -25,6 +25,8 @@
 #define LOCK_BUTTON_MASK DK_BTN2_MSK
 #define FUNCTION_BUTTON DK_BTN1
 #define FUNCTION_BUTTON_MASK DK_BTN1_MSK
+#define JOINER_BUTTON DK_BTN3
+#define JOINER_BUTTON_MASK DK_BTN3_MSK
 
 #define SYSTEM_STATE_LED DK_LED1
 #define LOCK_STATE_LED DK_LED2