Merge 8d72a73 into c38773d

project-chip · Oct 12, 2020 · 3562036 · 3562036
2 parents c38773d + 8d72a73
commit 3562036
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 2 deletions.
diff --git a/examples/lighting-app/nrfconnect/main/AppTask.cpp b/examples/lighting-app/nrfconnect/main/AppTask.cpp
@@ -27,6 +27,9 @@
 #include "Service.h"
 #include "ThreadUtil.h"
 
+#include "attribute-storage.h"
+#include "gen/cluster-id.h"
+
 #include <platform/CHIPDeviceLayer.h>
 
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
@@ -360,6 +363,8 @@ void AppTask::ActionInitiated(LightingManager::Action_t aAction)
     {
         LOG_INF("Turn Off Action has been initiated");
     }
+
+    sAppTask.mButtonTriggeredActon = (aActor == AppEvent::kEventType_Button) ? true : false;
 }
 
 void AppTask::ActionCompleted(LightingManager::Action_t aAction)
@@ -372,6 +377,12 @@ void AppTask::ActionCompleted(LightingManager::Action_t aAction)
     {
         LOG_INF("Turn Off Action has been completed");
     }
+
+    if (sAppTask.mButtonTriggeredActon)
+    {
+        sAppTask.UpdateClusterState();
+        sAppTask.mButtonTriggeredActon = false;
+    }
 }
 
 void AppTask::PostLightingActionRequest(LightingManager::Action_t aAction)
@@ -402,3 +413,21 @@ void AppTask::DispatchEvent(AppEvent * aEvent)
         LOG_INF("Event received with no handler. Dropping event.");
     }
 }
+
+void AppTask::UpdateClusterState()
+{
+    uint8_t newValue = LightingMgr().IsTurnedOn();
+
+    // write the new on/off value
+    EmberAfStatus status = emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, &newValue,
+                                                 ZCL_BOOLEAN_ATTRIBUTE_TYPE);
+    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        LOG_ERR("Updating on/off %x", status);
+    }
+}
+
+void emberAfPluginOnOffClusterServerPostInitCallback(uint8_t endpoint)
+{
+    GetAppTask().UpdateClusterState();
+}
diff --git a/examples/lighting-app/nrfconnect/main/include/AppTask.h b/examples/lighting-app/nrfconnect/main/include/AppTask.h
@@ -33,6 +33,7 @@ class AppTask
 
     void PostLightingActionRequest(LightingManager::Action_t aAction);
     void PostEvent(AppEvent * event);
+    void UpdateClusterState();
 
 private:
     friend AppTask & GetAppTask(void);
@@ -67,7 +68,7 @@ class AppTask
 
     Function_t mFunction;
     bool mFunctionTimerActive;
-
+    bool mButtonTriggeredActon;
     static AppTask sAppTask;
 };
 

diff --git a/examples/lock-app/nrfconnect/main/AppTask.cpp b/examples/lock-app/nrfconnect/main/AppTask.cpp
@@ -25,6 +25,9 @@
 #include "Service.h"
 #include "ThreadUtil.h"
 
+#include "attribute-storage.h"
+#include "gen/cluster-id.h"
+
 #include <platform/CHIPDeviceLayer.h>
 
 #include <dk_buttons_and_leds.h>
@@ -367,6 +370,8 @@ void AppTask::ActionInitiated(BoltLockManager::Action_t aAction, int32_t aActor)
         LOG_INF("Unlock Action has been initiated");
     }
 
+    sAppTask.mButtonTriggeredActon = (aActor == AppEvent::kEventType_Button) ? true : false;
+
     sLockLED.Blink(50, 50);
 }
 
@@ -385,6 +390,12 @@ void AppTask::ActionCompleted(BoltLockManager::Action_t aAction)
         LOG_INF("Unlock Action has been completed");
         sLockLED.Set(false);
     }
+
+    if (sAppTask.mButtonTriggeredActon)
+    {
+        sAppTask.UpdateClusterState();
+        sAppTask.mButtonTriggeredActon = false;
+    }
 }
 
 void AppTask::PostLockActionRequest(int32_t aActor, BoltLockManager::Action_t aAction)
@@ -416,3 +427,21 @@ void AppTask::DispatchEvent(AppEvent * aEvent)
         LOG_INF("Event received with no handler. Dropping event.");
     }
 }
+
+void AppTask::UpdateClusterState()
+{
+    uint8_t newValue = !BoltLockMgr().IsUnlocked();
+
+    // write the new on/off value
+    EmberAfStatus status = emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, &newValue,
+                                                 ZCL_BOOLEAN_ATTRIBUTE_TYPE);
+    if (status != EMBER_ZCL_STATUS_SUCCESS)
+    {
+        LOG_ERR("Updating on/off %x", status);
+    }
+}
+
+void emberAfPluginOnOffClusterServerPostInitCallback(uint8_t endpoint)
+{
+    GetAppTask().UpdateClusterState();
+}
diff --git a/examples/lock-app/nrfconnect/main/include/AppTask.h b/examples/lock-app/nrfconnect/main/include/AppTask.h
@@ -32,6 +32,7 @@ class AppTask
 
     void PostLockActionRequest(int32_t aActor, BoltLockManager::Action_t aAction);
     void PostEvent(AppEvent * event);
+    void UpdateClusterState();
 
 private:
     friend AppTask & GetAppTask(void);
@@ -66,7 +67,7 @@ class AppTask
 
     Function_t mFunction;
     bool mFunctionTimerActive;
-
+    bool mButtonTriggeredActon;
     static AppTask sAppTask;
 };