Revert Chef stubs.cpp to not using AttributeDelegate

Author: erwinpan1

examples/chef/common/clusters/switch/SwitchDelegate.cpp

@@ -21,7 +21,6 @@
 #include <app/server/Server.h>
 #include <app/util/att-storage.h>
 #include <platform/PlatformManager.h>
-#include "stubs.h"
 
 using namespace chip;
 using namespace chip::app;
@@ -135,20 +134,6 @@ void SwitchEventHandler::OnSwitchMultiPressCompleteHandler(uint8_t previousPosit
 
 static std::map<int, SwitchEventHandler *> gSwitchEventHandlers{};
 
-
-class SwitchAttributeDelegate : public AttributeDelegate
-{
-public:
-    SwitchAttributeDelegate (ClusterId clusterId) : AttributeDelegate(clusterId) {}
-
-    chip::Protocols::InteractionModel::Status PreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) override;
-
-    void PostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) override;
-    
-private:
-};
-
-
 SwitchEventHandler * GetSwitchEventHandler(EndpointId endpointId)
 {
     if (gSwitchEventHandlers.find(endpointId) == gSwitchEventHandlers.end()) {
@@ -158,41 +143,10 @@ SwitchEventHandler * GetSwitchEventHandler(EndpointId endpointId)
     return gSwitchEventHandlers[endpointId];
 }
 
-chip::Protocols::InteractionModel::Status SwitchAttributeDelegate::PreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value)
-{
-    chip::Protocols::InteractionModel::Status ret = chip::Protocols::InteractionModel::Status::Success;
-printf("\033[41m %s, %d \033[0m \n", __func__, __LINE__);
-    ChipLogProgress(Zcl, "SwitchAttributeDelegate::PostAttributeChangeCallback Endpoint: %d, Cluster: " ChipLogFormatMEI ", Type: %u, length %u", attributePath.mEndpointId, ChipLogValueMEI(attributePath.mClusterId), type, size);
-
-
-    return ret;
-}
-
-void SwitchAttributeDelegate::PostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value)
-{
-printf("\033[41m %s, %d \033[0m \n", __func__, __LINE__);
-    ChipLogProgress(Zcl, "SwitchAttributeDelegate::PostAttributeChangeCallback Endpoint: %d, Cluster: " ChipLogFormatMEI ", Type: %u, length %u", attributePath.mEndpointId, ChipLogValueMEI(attributePath.mClusterId), type, size);
-
-    switch (attributePath.mAttributeId) {
-    case Attributes::CurrentPosition::Id: {
-        SwitchEventHandler *eventHandler = GetSwitchEventHandler(attributePath.mEndpointId);
-        uint8_t newPosition = *value;
-
-        if (eventHandler) {
-            eventHandler->OnSwitchLatchedHandler(newPosition);
-        }
-        }
-        break;
-    default:
-        break;
-    }
-}
-
 void emberAfSwitchClusterInitCallback(EndpointId endpoint)
 {
     ChipLogProgress(Zcl, "Chef: emberAfSwitchClusterInitCallback");
     gSwitchEventHandlers[endpoint] = new SwitchEventHandler(endpoint);
-    RegisterApplicationAttributeDelegate(Switch::Id, new SwitchAttributeDelegate(Switch::Id));
 printf("\033[44m %s, %d, Switch::ID=%u \033[0m \n", __func__, __LINE__, Switch::Id);
 }
 

examples/chef/common/stubs.cpp

@@ -19,36 +19,12 @@
 #include "chef-concentration-measurement.h"
 #endif
 
-#include "stubs.h"
-#include <map>
-
 using chip::app::DataModel::Nullable;
 
 using namespace chip;
 using namespace chip::app;
 using namespace chip::app::Clusters;
 
-static std::map<ClusterId, AttributeDelegate * > gApplicationAttributeDelegates{}; 
-
-void chip::app::RegisterApplicationAttributeDelegate(ClusterId clusterId, AttributeDelegate * delegate)
-{
-   // TODO assert (gApplicationAttributeDelegates.find(clusterId) == gApplicationAttributeDelegates.end() )
-
-   gApplicationAttributeDelegates[clusterId] = delegate;
-
-}
-
-
-AttributeDelegate * GetApplicationAttributeDelegate(ClusterId clusterId)
-{
-    if (gApplicationAttributeDelegates.find(clusterId) == gApplicationAttributeDelegates.end()) {
-        return nullptr;
-    }
-
-    return gApplicationAttributeDelegates[clusterId];
-}
-
-
 Protocols::InteractionModel::Status emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId,
                                                                          const EmberAfAttributeMetadata * attributeMetadata,
                                                                          uint8_t * buffer, uint16_t maxReadLength)
@@ -137,54 +113,25 @@ Protocols::InteractionModel::Status emberAfExternalAttributeWriteCallback(Endpoi
 
 void emberAfPluginSmokeCoAlarmSelfTestRequestCommand(EndpointId endpointId) {}
 
-
-chip::Protocols::InteractionModel::Status
-MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
-                                 uint8_t * value)
-{
-    chip::Protocols::InteractionModel::Status ret = chip::Protocols::InteractionModel::Status::Success;
-
-    ChipLogProgress(Zcl, "MatterPostAttributeChangeCallback Endpoint: %d, Cluster: " ChipLogFormatMEI ", Type: %u, length %u", attributePath.mEndpointId, ChipLogValueMEI(attributePath.mClusterId), type, size);
-printf("\033[41m %s, %d \033[0m \n", __func__, __LINE__);
-
-    AttributeDelegate * delegate = GetApplicationAttributeDelegate(attributePath.mClusterId);
-    if (delegate) {
-        ret = delegate->PreAttributeChangeCallback(attributePath, type, size, value);
-    }
-
-    return ret; 
-}
-
 void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
                                        uint8_t * value)
 {
-//    AttributeId attributeId = attributePath.mAttributeId;
-    ChipLogProgress(Zcl, "MatterPostAttributeChangeCallback Endpoint: %d, Cluster: " ChipLogFormatMEI ", Type: %u, length %u", attributePath.mEndpointId, ChipLogValueMEI(attributePath.mClusterId), type, size);
-printf("\033[41m %s, %d \033[0m \n", __func__, __LINE__);
+    ClusterId clusterId     = attributePath.mClusterId;
+    AttributeId attributeId = attributePath.mAttributeId;
+    ChipLogProgress(Zcl, "Cluster callback: " ChipLogFormatMEI, ChipLogValueMEI(clusterId));
 
-    AttributeDelegate * delegate = GetApplicationAttributeDelegate(attributePath.mClusterId);
-    if (delegate) {
-        delegate->PostAttributeChangeCallback(attributePath, type, size, value);
-    }
-
-#if 0
-    switch (clusterId) {
-    case OnOff::Id:
-        ChipLogProgress(Zcl, "OnOff Cluster attribute ID: " ChipLogFormatMEI " Type: %u Value: %u, length %u", ChipLogValueMEI(attributeId),
+    if (clusterId == OnOff::Id && attributeId == OnOff::Attributes::OnOff::Id)
+    {
+        ChipLogProgress(Zcl, "OnOff attribute ID: " ChipLogFormatMEI " Type: %u Value: %u, length %u", ChipLogValueMEI(attributeId),
                         type, *value, size);
-        break;
-    case LevelControl::Id:
-        ChipLogProgress(Zcl, "Level Control Cluster attribute ID: " ChipLogFormatMEI " Type: %u Value: %u, length %u",
-                        ChipLogValueMEI(attributeId), type, *value, size);
-        break;
-    case Switch::Id:
-        ChipLogProgress(Zcl, "Switch Cluster attribute ID: " ChipLogFormatMEI " Type: %u Value: %u, length %u",
+    }
+    else if (clusterId == LevelControl::Id)
+    {
+        ChipLogProgress(Zcl, "Level Control attribute ID: " ChipLogFormatMEI " Type: %u Value: %u, length %u",
                         ChipLogValueMEI(attributeId), type, *value, size);
-        break;
-    default:
-        break;
+
+        // WIP Apply attribute change to Light
     }
-#endif
 }
 
 /** @brief OnOff Cluster Init